From 7c3558fa624d3069007df3e1071bcbd93be6d6c9 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 29 May 2020 17:23:15 -0400
Subject: [PATCH 1/2] Fix Docker configuration for Gitlab CI #2549

* Just missing the services I believe according to @rocode?
* I'm hoping to just completely eradicate the need for this setup with a follow-up PR for completely non-Docker approach on CI that supports celery, too.
---
 {{cookiecutter.project_slug}}/.gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index a74d5de8..f7c4f24a 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -23,6 +23,7 @@ pytest:
   stage: test
   image: python:3.7
   {% if cookiecutter.use_docker == 'y' -%}
+  image: docker/compose:latest
   tags:
     - docker
   services:

From d7f22a1158839d27ff898ae66f8edf39ac1943a6 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 29 May 2020 18:05:44 -0400
Subject: [PATCH 2/2] Changed service to Docker dind

---
 {{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 f7c4f24a..246c4c98 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -27,7 +27,7 @@ pytest:
   tags:
     - docker
   services:
-    - docker
+    - docker:dind
   before_script:
     - docker-compose -f local.yml build
     # Ensure celerybeat does not crash due to non-existent tables