From 98af3d94240716462f05466529fc8ccccea96edb Mon Sep 17 00:00:00 2001
From: Lilleman <lilleman@larvit.se>
Date: Mon, 14 Feb 2022 00:04:55 +0100
Subject: [PATCH] Changed so we don't have any volumes for drone to work better

---
 .drone.yml            | 8 +++-----
 Dockerfile.migrations | 3 +++
 docker-compose.yml    | 9 ++++++---
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 Dockerfile.migrations

diff --git a/.drone.yml b/.drone.yml
index 3bfcc25..a565cc3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,11 +6,9 @@ steps:
   - name: Tests
     image: docker/compose:1.29.2
     commands:
-      # - docker-compose run --rm db-migrations
-      # - docker-compose up -d
-      # - docker-compose run --rm tests
-      - pwd
-      - ls -l
+      - docker-compose run --rm db-migrations
+      - docker-compose up -d
+      - docker-compose run --rm tests
     volumes:
       - name: docker-sock
         path: /var/run/docker.sock
diff --git a/Dockerfile.migrations b/Dockerfile.migrations
new file mode 100644
index 0000000..3885a08
--- /dev/null
+++ b/Dockerfile.migrations
@@ -0,0 +1,3 @@
+FROM amacneil/dbmate:v1.12.1
+
+COPY db /db
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index bab27ba..3a87a5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,11 +11,14 @@ services:
       - 5432:5432
 
   db-migrations:
-    image: amacneil/dbmate:v1.12.1
+    build:
+      context: .
+      dockerfile: Dockerfile.migrations
+    # image: amacneil/dbmate:v1.12.1
     environment:
       - DATABASE_URL=postgres://postgres:postgres@postgres:5432/auth?sslmode=disable
-    volumes:
-      - "./db:/db:ro"
+    # volumes:
+    #   - "./db:/db:ro"
     command: ["--wait", "up"]
     profiles: ["migrations"]
     depends_on: