Merge pull request 'develop' (#3) from develop into master
Reviewed-on: #3
This commit is contained in:
commit
ff89b282ce
@ -14,13 +14,11 @@ steps:
|
|||||||
context: frontend
|
context: frontend
|
||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
- ${CI_COMMIT_SHA:0:7}
|
|
||||||
- ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
|
- ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
|
||||||
username:
|
username:
|
||||||
from_secret: DOCKER_USERNAME
|
from_secret: DOCKER_USERNAME
|
||||||
password:
|
password:
|
||||||
from_secret: DOCKER_PASSWORD
|
from_secret: DOCKER_PASSWORD
|
||||||
|
|
||||||
|
|
||||||
build-backend:
|
build-backend:
|
||||||
name: Build & Push Backend
|
name: Build & Push Backend
|
||||||
@ -37,7 +35,6 @@ steps:
|
|||||||
context: backend
|
context: backend
|
||||||
tags:
|
tags:
|
||||||
- latest
|
- latest
|
||||||
- ${CI_COMMIT_SHA:0:7}
|
|
||||||
- ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
|
- ${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}
|
||||||
username:
|
username:
|
||||||
from_secret: DOCKER_USERNAME
|
from_secret: DOCKER_USERNAME
|
||||||
@ -64,16 +61,12 @@ steps:
|
|||||||
- git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
|
- git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
|
||||||
- cd my-apps
|
- cd my-apps
|
||||||
- |
|
- |
|
||||||
if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
|
TAG="${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}"
|
||||||
TAG="develop-${CI_BUILD_NUMBER}"
|
|
||||||
else
|
|
||||||
TAG="${CI_COMMIT_SHA:0:7}"
|
|
||||||
fi
|
|
||||||
echo "💡 Setting frontend tag to: $TAG"
|
echo "💡 Setting frontend tag to: $TAG"
|
||||||
yq -i ".frontend.tag = \"$TAG\"" manifests/labmap/values.yaml
|
yq -i ".frontend.tag = \"$TAG\"" manifests/labmap/values.yaml
|
||||||
git add manifests/labmap/values.yaml
|
git add manifests/labmap/values.yaml
|
||||||
git commit -m "frontend: update tag to $TAG" || echo "No changes"
|
git commit -m "frontend: update tag to $TAG" || echo "No changes"
|
||||||
git push origin master
|
git push origin HEAD
|
||||||
|
|
||||||
update-values-backend:
|
update-values-backend:
|
||||||
name: Update backend tag in values.yaml
|
name: Update backend tag in values.yaml
|
||||||
@ -92,16 +85,11 @@ steps:
|
|||||||
- apk add --no-cache git yq
|
- apk add --no-cache git yq
|
||||||
- git config --global user.name "woodpecker-bot"
|
- git config --global user.name "woodpecker-bot"
|
||||||
- git config --global user.email "ci@dvirlabs.com"
|
- git config --global user.email "ci@dvirlabs.com"
|
||||||
- git clone "https://$${GIT_USERNAME}:$${GIT_TOKEN}@git.dvirlabs.com/dvirlabs/my-apps.git"
|
|
||||||
- cd my-apps
|
- cd my-apps
|
||||||
- |
|
- |
|
||||||
if [ "$CI_COMMIT_BRANCH" = "develop" ]; then
|
TAG="${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}"
|
||||||
TAG="develop-${CI_BUILD_NUMBER}"
|
|
||||||
else
|
|
||||||
TAG="${CI_COMMIT_SHA:0:7}"
|
|
||||||
fi
|
|
||||||
echo "💡 Setting backend tag to: $TAG"
|
echo "💡 Setting backend tag to: $TAG"
|
||||||
yq -i ".backend.tag = \"$TAG\"" manifests/labmap/values.yaml
|
yq -i ".backend.tag = \"$TAG\"" manifests/labmap/values.yaml
|
||||||
git add manifests/labmap/values.yaml
|
git add manifests/labmap/values.yaml
|
||||||
git commit -m "backend: update tag to $TAG" || echo "No changes"
|
git commit -m "backend: update tag to $TAG" || echo "No changes"
|
||||||
git push origin master
|
git push origin HEAD
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user