Moved development stuff to docker-compose

docker/Dockerfile.dev

@@ -7,4 +7,3 @@ COPY --chown=builder:builder ./docker/entrypoint_dev.sh /entrypoint.sh
 COPY --chown=builder:builder ./Rocket.toml /app/Rocket.toml
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["run", "--bin", "server"]

docker/docker-compose.dev.yml

@@ -0,0 +1,31 @@
+version: '2.4'
+services:
+    app:
+        build:
+            # Make sure the build context is one directory up
+            context: '..'
+            dockerfile: './docker/Dockerfile.dev'
+        image: 'chewingbever/fej:dev'
+        restart: 'no'
+
+        container_name: 'fej_app'
+        volumes:
+            - 'build-cache:/app/target'
+            - 'registry-cache:/app/.cargo/registry'
+        ports:
+            - '8000:8000'
+
+        command: "${CMD}"
+
+    db:
+        container_name: 'fej_db'
+        restart: 'no'
+
+        # the devop environment exposes the database so we can use the Diesel cli
+        ports:
+            - '5432:5432'
+
+volumes:
+    build-cache:
+    registry-cache:
+

docker/docker-compose.yml

@@ -2,13 +2,13 @@ version: '2.4'
 
 services:
     app:
+        build:
+            context: '..'
+            dockerfile: 'docker/Dockerfile.rel'
+
         image: 'chewingbever/fej:latest'
         restart: 'always'
 
-        depends_on:
-            db:
-                condition: 'service_healthy'
-
         environment:
             - 'DATABASE_URL=postgres://fej:fej@db:5432/fej'