diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f27edbee7..ad6681953 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ setup:containers:backend: &containers-backend image: ${IMAGE_BUILDER} script: - BACKEND_IMAGE_VERSION=`cat backend-image-version` - - buildah bud -t backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --volume ${CI_PROJECT_DIR}:${CI_PROJECT_DIR} --file docker/backend/Dockerfile + - buildah bud -t backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --volume ${CI_PROJECT_DIR}:/tmp/${CI_PROJECT_DIR} --file 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} rules: - changes: diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 010331a23..b0f18ec7e 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -10,9 +10,10 @@ RUN apt-get -y install llvm ENV LANG=en_US.UTF-8 ARG PROJECT_DIR=/fradrive +RUN cp -r /tmp/${PROJECT_DIR} ${PROJECT_DIR} WORKDIR ${PROJECT_DIR} ENV HOME=${PROJECT_DIR} -# ENV STACK_ROOT=${PROJECT_DIR}/.stack +ENV STACK_ROOT=${PROJECT_DIR}/.stack RUN echo "${PROJECT_DIR}" && pwd && ls -a . && make backend-dependencies