tiistai

.gitlab-ci.yml

@@ -33,13 +33,6 @@ e2e-testing:
     - docker image prune -f
     - docker-compose build --no-cache
     - docker-compose up -d
-  after_script:
-    - sleep 3
-    - echo "create database ehasa;" | docker exec -i postgis psql -U postgres
-    - echo "create user ehasa;" | docker exec -i postgis psql -U postgres
-    - echo "alter user ehasa with encrypted password 'salasana';" | docker exec -i postgis psql -U postgres
-    - echo "grant all privileges on database ehasa to ehasa;" | docker exec -i postgis psql -U postgres
-    - echo 'create extension "uuid-ossp";' | docker exec -i postgis psql -U postgres ehasa
   allow_failure: true
 
 rf-test:

docker-compose.yml

@@ -8,5 +8,7 @@ services:
   postgres:
     image: mdillon/postgis
     container_name: postgis
+    volumes:
+      - ./docker:/docker-entrypoint-initdb.d
     ports:
-      - 5432:5432
\ No newline at end of file
+      - 5432:5432

docker/run.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
+