From 5f434d5b2d1167da2f059e8f24f801f3b70b2ce4 Mon Sep 17 00:00:00 2001 From: David Beniamine <david.beniamine@tetras-libre.fr> Date: Tue, 14 Dec 2021 15:48:31 +0100 Subject: [PATCH] Use default env file for CI --- .gitlab-ci.yml | 7 ++++--- tools/ci-job.sh | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59d9782..bb5dbf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,15 +32,16 @@ composer: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker pull $TEST_IMAGE rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "web"' - if: '$CI_COMMIT_MESSAGE =~ /test/' - if: '$CI_COMMIT_BRANCH =~ /test/ || $CI_COMMIT_BRANCH == "production" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' script: # We need to copy files to a shared path that is accessible on the main host to allow the volume to work - - 'export SHARED_PATH="$(dirname ${CI_PROJECT_DIR})/shared"' + - 'export SHARED_PATH="/builds/${CI_PROJECT_DIR}/shared"' + - env - mkdir -p ${SHARED_PATH} - cp -r ${CI_PROJECT_DIR}/* ${SHARED_PATH} - - ls ${SHARED_PATH} + - cp -r ${CI_PROJECT_DIR}/.* ${SHARED_PATH} - docker run -v ${SHARED_PATH}:/sites/memorekall/www/web_dev -v /log:/sites/memorekall/www/web_dev/log --entrypoint /sites/memorekall/www/web_dev/tools/ci-job.sh $TEST_IMAGE artifacts: when: always diff --git a/tools/ci-job.sh b/tools/ci-job.sh index f1fef24..edc5050 100755 --- a/tools/ci-job.sh +++ b/tools/ci-job.sh @@ -18,6 +18,10 @@ run_step(){ fi } +cd $(dirname $(dirname $0)) +if [ ! -f ".env" ]; then + cp .env_default .env +fi run_step "Starting apache" apache2ctl -DFOREGROUND & run_step "PHP dependencies" composer install run_step "Javascript dependencies" npm install -- GitLab