gitlab-ci fixing

.gitlab-ci.yml

@@ -11,24 +11,22 @@ purge-old-containers:
   only:
     - testing
   script:
-    - echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USER" --password-stdin
-    - docker stop postgis
-    - docker rm postgis
-    - docker stop back
-    - docker rm back
-  after_script:
-    - docker logout
+    - docker-compose down
   allow_failure: true
 
-e2e-testing:
-  image: docker
+  e2e-testing:
+  image:
+    name: docker/compose:1.24.0
+    entrypoint: ['/bin/sh', '-c']
   services:
     - docker:dind
   stage: e2e-test
-  tags: ['docker']
+  tags: ['compose']
   only:
     - testing
   script:
-    - docker run --name postgis -p 5432:5432 -d -v docker:/docker-entrypoint-initdb.d/ mdillon/postgis
-    - docker build -t backend .
-    - docker run --name back -p 8080:5000 -d backend
+    - docker image prune -f
+    - docker-compose build --no-cache
+    - docker-compose up -d
+  allow_failure: true
+

docker-compose.yml

+version: '3'	
+	services:
+	  ehasa-backend:
+	    build: .
+	    ports:
+	      - 8080:5000
+	  postgres:
+	    image: mdillon/postgis
+      container_name: postgis
+	    volumes:
+	      - ./docker:/docker-entrypoint-initdb.d/
\ No newline at end of file