removed compose, added init.sh

.gitlab-ci.yml

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

docker-compose.yml

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

docker/init.sh

+#!/bin/bash
+psql -U postgres << EOF
+create database ehasa;
+\c ehasa;
+create user ehasa;
+alter user ehasa with encrypted password 'salasana';
+grant all privileges on database ehasa to ehasa;
+create extension "uuid-ossp";
+EOF
\ No newline at end of file