fix in ci script
This commit is contained in:
parent
e1eef2da2c
commit
7f6f67eb60
@ -2,7 +2,7 @@ stages:
|
|||||||
- check
|
- check
|
||||||
- generate
|
- generate
|
||||||
- build
|
- build
|
||||||
- deploy
|
- dockerize
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
IMAGE_BASE: $CI_REGISTRY/$CI_PROJECT_PATH
|
IMAGE_BASE: $CI_REGISTRY/$CI_PROJECT_PATH
|
||||||
@ -33,15 +33,15 @@ generate:
|
|||||||
script:
|
script:
|
||||||
- ./generate.sh
|
- ./generate.sh
|
||||||
|
|
||||||
build-api:
|
dockerize-api:
|
||||||
image: registry.hottis.de/dockerized/docker-bash:latest
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
stage: build
|
stage: dockerize
|
||||||
tags:
|
tags:
|
||||||
- hottis
|
- hottis
|
||||||
- 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 .
|
||||||
@ -60,8 +60,10 @@ build-ui:
|
|||||||
- hottis
|
- hottis
|
||||||
- linux
|
- linux
|
||||||
- docker
|
- docker
|
||||||
variables:
|
artifacts:
|
||||||
IMAGE_NAME: ${IMAGE_BASE}/api
|
paths:
|
||||||
|
- dist.tgz
|
||||||
|
expire_in: 1 day
|
||||||
script:
|
script:
|
||||||
- cd ui/hv2-ui
|
- cd ui/hv2-ui
|
||||||
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
- if [ "$CI_COMMIT_TAG" != "" ]; then
|
||||||
@ -69,8 +71,19 @@ build-ui:
|
|||||||
fi
|
fi
|
||||||
- npm install
|
- npm install
|
||||||
- ./node_modules/.bin/ng build --prod
|
- ./node_modules/.bin/ng build --prod
|
||||||
- mv dist ..
|
- tar -czf ../dist.tgz dist
|
||||||
- cd ..
|
|
||||||
|
dockerize-ui:
|
||||||
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
|
stage: dockerize
|
||||||
|
tags:
|
||||||
|
- hottis
|
||||||
|
- linux
|
||||||
|
- docker
|
||||||
|
variables:
|
||||||
|
IMAGE_NAME: $IMAGE_BASE/ui
|
||||||
|
script:
|
||||||
|
- 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