fix in ci
This commit is contained in:
parent
12da698cef
commit
4ec28e6064
@ -1,12 +1,8 @@
|
|||||||
stages:
|
stages:
|
||||||
- check
|
- check
|
||||||
- generate
|
|
||||||
- build
|
- build
|
||||||
- dockerize
|
- dockerize
|
||||||
|
|
||||||
variables:
|
|
||||||
IMAGE_BASE: ${CI_REGISTRY}/${CI_PROJECT_PATH}
|
|
||||||
|
|
||||||
|
|
||||||
check:
|
check:
|
||||||
image: registry.hottis.de/dockerized/base-build-env:latest
|
image: registry.hottis.de/dockerized/base-build-env:latest
|
||||||
@ -23,15 +19,6 @@ check:
|
|||||||
--validateMessage
|
--validateMessage
|
||||||
--messageToValidate "${CI_COMMIT_MESSAGE}"
|
--messageToValidate "${CI_COMMIT_MESSAGE}"
|
||||||
|
|
||||||
generate:
|
|
||||||
image: registry.hottis.de/dockerized/base-build-env:1.5.1
|
|
||||||
stage: generate
|
|
||||||
tags:
|
|
||||||
- hottis
|
|
||||||
- linux
|
|
||||||
- docker
|
|
||||||
script:
|
|
||||||
- ./generate.sh
|
|
||||||
|
|
||||||
dockerize-api:
|
dockerize-api:
|
||||||
image: registry.hottis.de/dockerized/docker-bash:latest
|
image: registry.hottis.de/dockerized/docker-bash:latest
|
||||||
@ -81,7 +68,7 @@ dockerize-ui:
|
|||||||
- linux
|
- linux
|
||||||
- docker
|
- docker
|
||||||
variables:
|
variables:
|
||||||
IMAGE_NAME: "${IMAGE_BASE}/ui"
|
IMAGE_NAME: ${CI_REGISTRY}/${CI_PROJECT_PATH}/ui
|
||||||
script:
|
script:
|
||||||
- cd ui
|
- cd ui
|
||||||
- tar -xzf ../dist.tgz
|
- tar -xzf ../dist.tgz
|
||||||
|
@ -29,17 +29,13 @@ RUN \
|
|||||||
useradd -d ${APP_DIR} -u 1000 user
|
useradd -d ${APP_DIR} -u 1000 user
|
||||||
|
|
||||||
COPY *.py ${APP_DIR}/
|
COPY *.py ${APP_DIR}/
|
||||||
COPY openapi.yaml.tmpl ${APP_DIR}/
|
COPY openapi.yaml ${APP_DIR}/
|
||||||
COPY methods.py.tmpl ${APP_DIR}/
|
COPY methods.py ${APP_DIR}/
|
||||||
COPY schema.json ${APP_DIR}/
|
|
||||||
COPY server.ini ${CONF_DIR}/
|
COPY server.ini ${CONF_DIR}/
|
||||||
|
|
||||||
WORKDIR ${APP_DIR}
|
WORKDIR ${APP_DIR}
|
||||||
VOLUME ${CONF_DIR}
|
VOLUME ${CONF_DIR}
|
||||||
|
|
||||||
RUN \
|
|
||||||
python3 generate.py
|
|
||||||
|
|
||||||
USER 1000:1000
|
USER 1000:1000
|
||||||
|
|
||||||
EXPOSE 5000
|
EXPOSE 5000
|
||||||
|
Loading…
x
Reference in New Issue
Block a user