diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad6681953..6142b4129 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,7 @@ setup:containers:frontend: &containers-frontend image: ${IMAGE_BUILDER} script: - FRONTEND_IMAGE_VERSION=`cat frontend-image-version` - - buildah bud -t frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --volume ${CI_PROJECT_DIR}:${CI_PROJECT_DIR} --file docker/frontend/Dockerfile + - buildah bud -t frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --volume ${CI_PROJECT_DIR}:/tmp/${CI_PROJECT_DIR} --file 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} rules: - changes: diff --git a/.gitlab-ci/backend.yml b/.gitlab-ci/backend.yml index cbbc83c1a..aa29a7742 100644 --- a/.gitlab-ci/backend.yml +++ b/.gitlab-ci/backend.yml @@ -22,7 +22,7 @@ stages: default: image: name: ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} - # entrypoint: [""] + entrypoint: [""] docker: platform: x86_64 artifacts: @@ -38,7 +38,8 @@ compile: - make -- backend-build${PROD_BUILD} artifacts: paths: - - /fradrive/.stack-work/ + - ${CI_PROJECT_DIR}/.stack-work/ + - ${CI_PROJECT_DIR}/.stack/ cache: &backend-cache lint: diff --git a/.gitlab-ci/frontend.yml b/.gitlab-ci/frontend.yml index a81857aec..7eec4cf4c 100644 --- a/.gitlab-ci/frontend.yml +++ b/.gitlab-ci/frontend.yml @@ -38,14 +38,14 @@ compile: - make -- frontend-build artifacts: paths: - - /fradrive/node_modules - - /fradrive/well-known + - ${CI_PROJECT_DIR}/node_modules + - ${CI_PROJECT_DIR}/well-known cache: - &frontend-cache key: default-frontend paths: - - /fradrive/.npm/ - - /fradrive/.well-known-cache/ + - ${CI_PROJECT_DIR}/.npm/ + - ${CI_PROJECT_DIR}/.well-known-cache/ lint: stage: lint