From 3e0af857c6f09b533cd72486a4374402283f43ca Mon Sep 17 00:00:00 2001 From: Hannes Feldt <feldt@astron.nl> Date: Thu, 30 Nov 2023 11:33:21 +0100 Subject: [PATCH] fixes --- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 4 ++-- {{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile | 2 +- .../docker/{{cookiecutter.project_slug}}}/Dockerfile | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename {docker/package => {{cookiecutter.project_slug}}/docker/{{cookiecutter.project_slug}}}/Dockerfile (100%) diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 45a5b3a..88fa1d0 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -132,8 +132,8 @@ docker_build: - name: docker:dind script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker build . --build-arg BUILD_ENV=copy --tag $CI_REGISTRY_IMAGE/package_name:$CI_COMMIT_REF_SLUG - # - docker push $CI_REGISTRY_IMAGE/package_name:$CI_COMMIT_REF_SLUG + - docker build -f docker/{{cookiecutter.project_slug}}/Dockerfile . --build-arg BUILD_ENV=copy --tag $CI_REGISTRY_IMAGE/{{cookiecutter.project_slug}}:$CI_COMMIT_REF_SLUG + # - docker push $CI_REGISTRY_IMAGE/{{cookiecutter.project_slug}}:$CI_COMMIT_REF_SLUG run_integration_tests: stage: integration diff --git a/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile b/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile index 01d5ee1..3671267 100644 --- a/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile +++ b/{{cookiecutter.project_slug}}/docker/ci-runner/Dockerfile @@ -1,4 +1,4 @@ FROM python:3.11 RUN python -m pip install --upgrade pip -RUN pip install --upgrade tox twine +RUN python -m pip install --upgrade tox twine diff --git a/docker/package/Dockerfile b/{{cookiecutter.project_slug}}/docker/{{cookiecutter.project_slug}}/Dockerfile similarity index 100% rename from docker/package/Dockerfile rename to {{cookiecutter.project_slug}}/docker/{{cookiecutter.project_slug}}/Dockerfile -- GitLab