From ab1934e86cdc81b54fdc37c5d6b071157b760c15 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski <janne@kuschku.de> Date: Wed, 15 Jun 2022 14:55:25 +0000 Subject: [PATCH] ci: fix automated build issues --- .gitlab-ci.yml | 4 ++-- seahub/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33d2f9d..0ccdfcb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ server: script: - mkdir -p /kaniko/.docker - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - - /kaniko/executor --context server/$CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/server/Dockerfile --destination $CI_REGISTRY_IMAGE:server-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:server + - /kaniko/executor --cache=true --context $CI_PROJECT_DIR/server --dockerfile $CI_PROJECT_DIR/server/Dockerfile --destination $CI_REGISTRY_IMAGE:server-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:server seahub: stage: build image: @@ -15,6 +15,6 @@ seahub: script: - mkdir -p /kaniko/.docker - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - - /kaniko/executor --context seahub/$CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/seahub/Dockerfile --destination $CI_REGISTRY_IMAGE:seahub-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:seahub + - /kaniko/executor --cache=true --context $CI_PROJECT_DIR/seahub --dockerfile $CI_PROJECT_DIR/seahub/Dockerfile --destination $CI_REGISTRY_IMAGE:seahub-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:seahub needs: - "server" diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 60e0c68..23077b5 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /source/seahub/frontend RUN npm install --force RUN npm run build -ADD entrypoint.sh / +COPY entrypoint.sh /entrypoint.sh WORKDIR /source/seahub ENV PYTHONPATH="/usr/local/lib/python3.10/site-packages/:/source/seahub/thirdpart:$PYTHONPATH" -- GitLab