fix #108: refactor Dockerfile

octopot · Oct 17, 2018 · 25e4f62 · 25e4f62
1 parent 75ad129
commit 25e4f62
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/env/docker-compose.mk b/env/docker-compose.mk
@@ -1,4 +1,5 @@
-COMPOSE ?= docker-compose -f env/docker-compose.base.yml -f env/docker-compose.dev.yml -p forma
+_base   = docker-compose -p forma -f env/docker/compose/docker-compose.base.yml
+COMPOSE = $(_base) -f env/docker/compose/docker-compose.dev.yml
 
 
 .PHONY: __env__

diff --git a/env/docker.mk b/env/docker.mk
@@ -1,4 +1,4 @@
-IMAGE_VERSION := 2.x
+IMAGE_VERSION := 3.x
 PACKAGE       := github.com/kamilsk/form-api
 
 

diff --git a/env/docker-compose.base.yml → env/docker/compose/docker-compose.base.yml b/env/docker-compose.base.yml → env/docker/compose/docker-compose.base.yml
@@ -7,15 +7,15 @@ services:
     env_file: .env
 
   migration:
-    image: kamilsk/form-api:2.x # https://hub.docker.com/r/kamilsk/form-api/
-    command: [ "migrate", "up" ]
+    image: kamilsk/form-api:3.x # https://hub.docker.com/r/kamilsk/form-api/
+    command: [ "migrate" ]
     depends_on:
     - db
     env_file: .env
     restart: on-failure
 
   service:
-    image: kamilsk/form-api:2.x # https://hub.docker.com/r/kamilsk/form-api/
+    image: kamilsk/form-api:3.x # https://hub.docker.com/r/kamilsk/form-api/
     command: [ "run", "--with-profiling", "--with-monitoring" ]
     depends_on:
     - migration

diff --git a/env/docker-compose.ci.yml → env/docker/compose/docker-compose.ci.yml b/env/docker-compose.ci.yml → env/docker/compose/docker-compose.ci.yml
diff --git a/env/docker-compose.demo.yml → env/docker/compose/docker-compose.demo.yml b/env/docker-compose.demo.yml → env/docker/compose/docker-compose.demo.yml
diff --git a/env/docker-compose.dev.yml → env/docker/compose/docker-compose.dev.yml b/env/docker-compose.dev.yml → env/docker/compose/docker-compose.dev.yml
@@ -1,6 +1,7 @@
 version: "3"
 
 services:
+
   db:
     ports:
     - ${LOCAL_DB_PORT}:5432
@@ -10,14 +11,14 @@ services:
   migration:
     build:
       args:       { PACKAGE: "${PACKAGE}" }
-      context:    ../.
-      dockerfile: ./env/Dockerfile
+      context:    ../../../.
+      dockerfile: ./env/docker/service/Dockerfile
 
   service:
     build:
       args:       { PACKAGE: "${PACKAGE}" }
-      context:    ../.
-      dockerfile: ./env/Dockerfile
+      context:    ../../../.
+      dockerfile: ./env/docker/service/Dockerfile
     ports:
     - ${LOCAL_SERVICE_HTTP_PORT}:80
     - ${LOCAL_SERVICE_PROFILING_PORT}:8090
@@ -36,10 +37,8 @@ services:
     - letsencrypt:/etc/letsencrypt
 
 volumes:
-  pgdata:
-    driver: local
 
-  certificates:
-    driver: local
-  letsencrypt:
-    driver: local
+  pgdata:       { driver: local }
+
+  certificates: { driver: local }
+  letsencrypt:  { driver: local }
diff --git a/env/Dockerfile → env/docker/service/Dockerfile b/env/Dockerfile → env/docker/service/Dockerfile
@@ -36,4 +36,4 @@ EXPOSE ${HTTP_PORT} \
        ${GRPC_PORT}
 
 ENTRYPOINT [ "service" ]
-CMD        [ "run" ]
+CMD        [ "help", "run" ]