fix in ci
This commit is contained in:
parent
7f6f67eb60
commit
fc1393b410
@ -5,7 +5,7 @@ stages:
|
|||||||
- dockerize
|
- dockerize
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
IMAGE_BASE: $CI_REGISTRY/$CI_PROJECT_PATH
|
IMAGE_BASE: ${CI_REGISTRY}/${CI_PROJECT_PATH}
|
||||||
|
|
||||||
|
|
||||||
check:
|
check:
|
||||||
@ -41,10 +41,10 @@ dockerize-api:
|
|||||||
- linux
|
- linux
|
||||||
- docker
|
- docker
|
||||||
variables:
|
variables:
|
||||||
IMAGE_NAME: $IMAGE_BASE/api
|
IMAGE_NAME: ${IMAGE_BASE}/api
|
||||||
script:
|
script:
|
||||||
- cd api
|
- cd api
|
||||||
- docker build --tag $IMAGE_NAME:latest .
|
- docker build --tag ${IMAGE_NAME}:latest .
|
||||||
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
||||||
docker tag $IMAGE_NAME:latest $IMAGE_NAME:${CI_COMMIT_TAG};
|
docker tag $IMAGE_NAME:latest $IMAGE_NAME:${CI_COMMIT_TAG};
|
||||||
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
|
docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY;
|
||||||
@ -71,7 +71,7 @@ build-ui:
|
|||||||
fi
|
fi
|
||||||
- npm install
|
- npm install
|
||||||
- ./node_modules/.bin/ng build --prod
|
- ./node_modules/.bin/ng build --prod
|
||||||
- tar -czf ../dist.tgz dist
|
- tar -czf ../../dist.tgz dist
|
||||||
|
|
||||||
dockerize-ui:
|
dockerize-ui:
|
||||||
image: registry.hottis.de/dockerized/docker-bash:latest
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
@ -81,9 +81,10 @@ dockerize-ui:
|
|||||||
- linux
|
- linux
|
||||||
- docker
|
- docker
|
||||||
variables:
|
variables:
|
||||||
IMAGE_NAME: $IMAGE_BASE/ui
|
IMAGE_NAME: ${IMAGE_BASE}/ui
|
||||||
script:
|
script:
|
||||||
- tar -xzf dist.tgz
|
- cd ui
|
||||||
|
- tar -xzf ../dist.tgz
|
||||||
- docker build --tag $IMAGE_NAME:latest .
|
- docker build --tag $IMAGE_NAME:latest .
|
||||||
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
||||||
docker tag $IMAGE_NAME:latest $IMAGE_NAME:${CI_COMMIT_TAG};
|
docker tag $IMAGE_NAME:latest $IMAGE_NAME:${CI_COMMIT_TAG};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user