docker: split base-dev by tools used

Author: jgauthi

.docker/compose/base-dev.yml

@@ -12,60 +12,6 @@ services:
     volumes:
       - mysql-db:/var/lib/mysql
 
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    labels:
-      traefik.enable: true
-      traefik.http.services.pma.loadbalancer.server.port: 80
-      traefik.http.routers.pma.rule: "Host(`pma.localhost.tv`)"
-      traefik.http.routers.pma.entrypoints: web
-    environment:
-      PMA_HOST: ${DB_HOST}
-      PMA_PORT: ${DB_PORT}
-      PMA_USER: ${DB_USER}
-      PMA_PASSWORD: ${DB_PASS}
-    ports:
-      - 80
-    volumes:
-      - ./../phpmyadmin/config.inc.php:/etc/phpmyadmin/config.user.inc.php
-      - ./../phpmyadmin/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
-    depends_on:
-      - db
-    links:
-      - db
-    networks:
-      sfdemo:
-        aliases:
-          - pma.localhost.tv
-
-  maildev:
-    image: maildev/maildev
-    labels:
-      traefik.enable: true
-      traefik.http.services.maildev.loadbalancer.server.port: 1080
-      traefik.http.routers.maildev.rule: "Host(`maildev.localhost.tv`)"
-    ports:
-      - 1080
-      - 1025
-    networks:
-      sfdemo:
-        aliases:
-          - maildev.localhost.tv
-
-#  maildev:
-#    image: djfarrelly/maildev
-#    labels:
-#      traefik.enable: true
-#      traefik.http.services.maildev.loadbalancer.server.port: 80
-#      traefik.http.routers.maildev.rule: "Host(`maildev.localhost.tv`)"
-#    ports:
-#      - 80
-#      - 25
-#    networks:
-#      sfdemo:
-#        aliases:
-#          - maildev.localhost.tv
-
   traefik:
     image: traefik:v2.3
     command:

.docker/compose/docker.env

@@ -1,7 +1,7 @@
 # Docker Configuration
 COMPOSE_PATH_SEPARATOR=;
 COMPOSE_PROJECT_NAME=sfdemo
-COMPOSE_FILE=.docker/compose/base.yml;.docker/compose/base-dev.yml
+COMPOSE_FILE=.docker/compose/base.yml;.docker/compose/base-dev.yml;.docker/compose/phpmyadmin.yml;.docker/compose/maildev.yml
 # VOLUME_USER_ID=1001 # You can set your Linux UserID (command: id -u)
 # COMPOSER_HOME=/home/$user/.cache/composer/  # You can set your composer folder, change $user by your username
 

.docker/compose/maildev.yml

@@ -0,0 +1,15 @@
+version: '3.6'
+services:
+  maildev:
+    image: maildev/maildev
+    labels:
+      traefik.enable: true
+      traefik.http.services.maildev.loadbalancer.server.port: 1080
+      traefik.http.routers.maildev.rule: "Host(`maildev.localhost.tv`)"
+    ports:
+      - 1080
+      - 1025
+    networks:
+      sfdemo:
+        aliases:
+          - maildev.localhost.tv

.docker/compose/phpmyadmin.yml

@@ -0,0 +1,27 @@
+version: '3.6'
+services:
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    labels:
+      traefik.enable: true
+      traefik.http.services.pma.loadbalancer.server.port: 80
+      traefik.http.routers.pma.rule: "Host(`pma.localhost.tv`)"
+      traefik.http.routers.pma.entrypoints: web
+    environment:
+      PMA_HOST: ${DB_HOST}
+      PMA_PORT: ${DB_PORT}
+      PMA_USER: ${DB_USER}
+      PMA_PASSWORD: ${DB_PASS}
+    ports:
+      - 80
+    volumes:
+      - ./../phpmyadmin/config.inc.php:/etc/phpmyadmin/config.user.inc.php
+      - ./../phpmyadmin/uploads.ini:/usr/local/etc/php/conf.d/uploads.ini
+    depends_on:
+      - db
+    links:
+      - db
+    networks:
+      sfdemo:
+        aliases:
+          - pma.localhost.tv

Makefile

@@ -190,7 +190,7 @@ build:
 	@$(DOCKER_COMPOSE) build --force-rm
 
 up-ci:
-	@$(DOCKER_COMPOSE) up -d --remove-orphans
+	@$(DOCKER_COMPOSE) up -d --remove-orphans --force-recreate
 
 perm: ## Set folder permissions
 	@$(EXEC_ROOT) chmod -R 775 var migrations