From 15c4857a4bb256a238944a3d4ce76671b825ce9a Mon Sep 17 00:00:00 2001
From: ahgraber <ahgraber@ninerealmlabs.com>
Date: Thu, 4 Feb 2021 14:03:17 -0500
Subject: [PATCH] fix /docker/dev/docker-compose.yaml

---
 docker/dev/docker-compose.yaml | 78 +++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/docker/dev/docker-compose.yaml b/docker/dev/docker-compose.yaml
index 46322a4..1cc1bfa 100644
--- a/docker/dev/docker-compose.yaml
+++ b/docker/dev/docker-compose.yaml
@@ -2,48 +2,50 @@
 # RUN: ```docker-compose --env-file```
 version: "3.7"
 
-secrets:
-  # paths assume the .secrets folder is sibling depth to folder where docker-compose resides
-  DB_ROOT_PWD:
-    file: ../../../homelab-setup/docker_secrets/db_root_pwd.txt
-  MYSQL_PWD:
-    file: ../../../homelab-setup/docker_secrets/mysql_pwd.txt
+# secrets:
+#   # paths assume the .secrets folder is sibling depth to folder where docker-compose resides
+#   DB_ROOT_PWD:
+#     file: ../../../homelab-setup/docker_secrets/db_root_pwd.txt
+#   MYSQL_PWD:
+#     file: ../../../homelab-setup/docker_secrets/mysql_pwd.txt
 
 services:
-  mariadb:
-    image: mariadb:test
-    container_name: mariadb
-    secrets:
-      - DB_ROOT_PWD
-      - MYSQL_PWD
-    environment:
-      # MYSQL_ROOT_PASSWORD: "npm"
-      MYSQL_ROOT_PASSWORD__FILE: /run/secrets/DB_ROOT_PWD
-      MYSQL_DATABASE: "npm"
-      MYSQL_USER: "npm"
-      # MYSQL_PASSWORD: "npm"
-      MYSQL_PASSWORD__FILE: /run/secrets/MYSQL_PWD 
-    volumes:
-      - ./data/mysql:/var/lib/mysql
+  # mariadb:
+  #   image: mariadb:test
+  #   container_name: mariadb
+  #   secrets:
+  #     - DB_ROOT_PWD
+  #     - MYSQL_PWD
+  #   environment:
+  #     # MYSQL_ROOT_PASSWORD: "npm"
+  #     MYSQL_ROOT_PASSWORD__FILE: /run/secrets/DB_ROOT_PWD
+  #     MYSQL_DATABASE: "npm"
+  #     MYSQL_USER: "npm"
+  #     # MYSQL_PASSWORD: "npm"
+  #     MYSQL_PASSWORD__FILE: /run/secrets/MYSQL_PWD 
+  #   volumes:
+  #     - ./data/mysql:/var/lib/mysql
 
   npm:
     build:   
-      context: ../../
-      dockerfile: ./docker/Dockerfile
+      context: ../
+      dockerfile: ./dev/Dockerfile
+      # args:
+      #   TARGETPLATFORM: arm64v8
     image: npm:test              # provide a name and tag for the image
     container_name: npm
-    secrets:
-      - MYSQL_PWD
-    environment:
-      DISABLE_IPV6: 'true'
-      DB_MYSQL_HOST: "mariadb"
-      DB_MYSQL_PORT: 3306
-      MYSQL_DATABASE: "npm"
-      MYSQL_USER: "npm"
-      # MYSQL_PASSWORD: "npm"
-      MYSQL_PASSWORD__FILE: /run/secrets/MYSQL_PWD 
-    volumes:
-      - ./data/npm:/data
-      - ./data/letsencrypt:/etc/letsencrypt
-    depends_on:
-      - mariadb
\ No newline at end of file
+    # secrets:
+    #   - MYSQL_PWD
+    # environment:
+    #   DISABLE_IPV6: 'true'
+    #   DB_MYSQL_HOST: "mariadb"
+    #   DB_MYSQL_PORT: 3306
+    #   MYSQL_DATABASE: "npm"
+    #   MYSQL_USER: "npm"
+    #   # MYSQL_PASSWORD: "npm"
+    #   MYSQL_PASSWORD__FILE: /run/secrets/MYSQL_PWD 
+    # volumes:
+    #   - ./data/npm:/data
+    #   - ./data/letsencrypt:/etc/letsencrypt
+    # depends_on:
+    #   - mariadb
\ No newline at end of file