fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

ci(gitlab-ci): control image workdir via env var

Browse Source
This commit is contained in:
Sarah Vaupel 2024-08-25 17:30:22 +02:00
parent 9c0903bd4f
commit 9d18b74ec5
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -74,7 +74,7 @@ setup:containers:frontend: &containers-frontend
image: ${IMAGE_BUILDER} image: ${IMAGE_BUILDER}
script: script:
- FRONTEND_IMAGE_VERSION=`cat frontend-image-version` - FRONTEND_IMAGE_VERSION=`cat frontend-image-version`
- buildah bud -t frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} docker/frontend/Dockerfile - buildah bud -t frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} --env PROJECT_DIR=${CI_PROJECT_DIR} docker/frontend/Dockerfile
- buildah push --creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} ${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} - buildah push --creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} ${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
rules: rules:
- changes: - changes:
@ -93,7 +93,7 @@ setup:containers:backend: &containers-backend
image: ${IMAGE_BUILDER} image: ${IMAGE_BUILDER}
script: script:
- BACKEND_IMAGE_VERSION=`cat backend-image-version` - BACKEND_IMAGE_VERSION=`cat backend-image-version`
- buildah bud -t backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} docker/backend/Dockerfile - buildah bud -t backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} --env PROJECT_DIR=${CI_PROJECT_DIR} docker/backend/Dockerfile
- buildah push --creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} - buildah push --creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION}
rules: rules:
- changes: - changes:

9
docker/backend/Dockerfile
View File

@ -7,12 +7,13 @@ RUN apt-get -y install haskell-stack git
RUN apt-get -y install alex g++ happy libghc-zlib-dev libpq-dev libsodium-dev locales locales-all pkg-config RUN apt-get -y install alex g++ happy libghc-zlib-dev libpq-dev libsodium-dev locales locales-all pkg-config
RUN apt-get -y install llvm RUN apt-get -y install llvm
WORKDIR /fradrive
ENV HOME=/fradrive
ENV STACK_ROOT=/fradrive/.stack
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
ENV PROJECT_DIR=/fradrive
WORKDIR ${PROJECT_DIR}
ENV HOME=${PROJECT_DIR}
ENV STACK_ROOT=${PROJECT_DIR}/.stack
RUN make backend-dependencies RUN make backend-dependencies
ENV FRADRIVE_MAKE_TARGET=backend-build ENV FRADRIVE_MAKE_TARGET=backend-build

6
docker/frontend/Dockerfile
View File

@ -17,9 +17,9 @@ ENV CHROME_BIN=chromium
# RUN npm install -g n # RUN npm install -g n
# RUN n 14.19.1 # RUN n 14.19.1
WORKDIR /fradrive ENV PROJECT_DIR=/fradrive
WORKDIR ${PROJECT_DIR}
ENV HOME=/fradrive ENV HOME=${PROJECT_DIR}
ENV FRADRIVE_MAKE_TARGET=frontend-watch ENV FRADRIVE_MAKE_TARGET=frontend-watch
ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} CHROME_BIN=${CHROME_BIN} ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} CHROME_BIN=${CHROME_BIN}