beta secrets

docker/dev/Dockerfile

@@ -27,6 +27,6 @@ EXPOSE 80
 EXPOSE 81
 EXPOSE 443
 
-CMD [ "/init" ]
+ENTRYPOINT [ "/init" ]
 
 HEALTHCHECK --interval=5s --timeout=3s CMD /bin/check-health

docker/dev/docker-compose.yaml

@@ -0,0 +1,49 @@
+# docker-compose.yml
+# 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
+
+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
+
+  npm:
+    build:   
+      context: ../../
+      dockerfile: ./docker/Dockerfile
+    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

docker/docker-compose.yaml

@@ -1,24 +0,0 @@
-# docker-compose.yml
-# RUN: ```docker-compose --env-file```
-version: "3.7"
-
-services:
-  npm:
-    build:   
-      context: ../
-      dockerfile: ./docker/Dockerfile
-      args:
-        VERSION: 2.7.3  #"${NPM_VERSION}"  # if using .env file
-    image: npm:test              # provide a name and tag for the image
-  # mariadb:
-  #   build:
-  #     context: .
-  #     dockerfile: Dockerfile-mariadb
-  #     args:
-  #       VERSION: 10.4.15  #"${MARIADB_VERSION}"  # if using .env file
-  #   image: mariadb:test
-
-
-  # volumes:  # Optional, same as `docker volume create`
-
-  # networks:  # Optional, same as `docker network create`