diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 45a5b3a93949c5018e6f89bfa8e8c3560f060ced..88fa1d04e23e8918d138033177b78d9870a6a234 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 01d5ee1b5eb9da1e6f7f3d89806bbc1d1787c7ed..36712675df843bcdf8b5a0f38a60f4cf73584a85 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