From 5314faaf8adaf2fcd5cd3b369bca2fc8ebdbc51a Mon Sep 17 00:00:00 2001 From: Tames McTigue Date: Tue, 30 Mar 2021 13:09:29 +0300 Subject: [PATCH 1/2] Fixed placement of image key value for non-Docker run. --- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index 60925b81..fcdfb7dd 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -21,7 +21,6 @@ flake8: pytest: stage: test - image: python:3.8 {% if cookiecutter.use_docker == 'y' -%} image: docker/compose:latest tags: @@ -36,6 +35,7 @@ pytest: script: - docker-compose -f local.yml run django pytest {%- else %} + image: python:3.8 tags: - python services: From 49bf68aa006986e427665400f9fd99b09b34fda1 Mon Sep 17 00:00:00 2001 From: Tames McTigue Date: Tue, 30 Mar 2021 13:26:12 +0300 Subject: [PATCH 2/2] Fixed blank space --- {{cookiecutter.project_slug}}/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml index fcdfb7dd..c599f6b6 100644 --- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml +++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml @@ -34,7 +34,7 @@ pytest: - docker-compose -f local.yml up -d script: - docker-compose -f local.yml run django pytest - {%- else %} + {%- else -%} image: python:3.8 tags: - python