Skip to content

Commit 15c4857

Browse files
committed
fix /docker/dev/docker-compose.yaml
1 parent 63a71af commit 15c4857

File tree

1 file changed

+40
-38
lines changed

1 file changed

+40
-38
lines changed

docker/dev/docker-compose.yaml

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,50 @@
22
# RUN: ```docker-compose --env-file```
33
version: "3.7"
44

5-
secrets:
6-
# paths assume the .secrets folder is sibling depth to folder where docker-compose resides
7-
DB_ROOT_PWD:
8-
file: ../../../homelab-setup/docker_secrets/db_root_pwd.txt
9-
MYSQL_PWD:
10-
file: ../../../homelab-setup/docker_secrets/mysql_pwd.txt
5+
# secrets:
6+
# # paths assume the .secrets folder is sibling depth to folder where docker-compose resides
7+
# DB_ROOT_PWD:
8+
# file: ../../../homelab-setup/docker_secrets/db_root_pwd.txt
9+
# MYSQL_PWD:
10+
# file: ../../../homelab-setup/docker_secrets/mysql_pwd.txt
1111

1212
services:
13-
mariadb:
14-
image: mariadb:test
15-
container_name: mariadb
16-
secrets:
17-
- DB_ROOT_PWD
18-
- MYSQL_PWD
19-
environment:
20-
# MYSQL_ROOT_PASSWORD: "npm"
21-
MYSQL_ROOT_PASSWORD__FILE: /run/secrets/DB_ROOT_PWD
22-
MYSQL_DATABASE: "npm"
23-
MYSQL_USER: "npm"
24-
# MYSQL_PASSWORD: "npm"
25-
MYSQL_PASSWORD__FILE: /run/secrets/MYSQL_PWD
26-
volumes:
27-
- ./data/mysql:/var/lib/mysql
13+
# mariadb:
14+
# image: mariadb:test
15+
# container_name: mariadb
16+
# secrets:
17+
# - DB_ROOT_PWD
18+
# - MYSQL_PWD
19+
# environment:
20+
# # MYSQL_ROOT_PASSWORD: "npm"
21+
# MYSQL_ROOT_PASSWORD__FILE: /run/secrets/DB_ROOT_PWD
22+
# MYSQL_DATABASE: "npm"
23+
# MYSQL_USER: "npm"
24+
# # MYSQL_PASSWORD: "npm"
25+
# MYSQL_PASSWORD__FILE: /run/secrets/MYSQL_PWD
26+
# volumes:
27+
# - ./data/mysql:/var/lib/mysql
2828

2929
npm:
3030
build:
31-
context: ../../
32-
dockerfile: ./docker/Dockerfile
31+
context: ../
32+
dockerfile: ./dev/Dockerfile
33+
# args:
34+
# TARGETPLATFORM: arm64v8
3335
image: npm:test # provide a name and tag for the image
3436
container_name: npm
35-
secrets:
36-
- MYSQL_PWD
37-
environment:
38-
DISABLE_IPV6: 'true'
39-
DB_MYSQL_HOST: "mariadb"
40-
DB_MYSQL_PORT: 3306
41-
MYSQL_DATABASE: "npm"
42-
MYSQL_USER: "npm"
43-
# MYSQL_PASSWORD: "npm"
44-
MYSQL_PASSWORD__FILE: /run/secrets/MYSQL_PWD
45-
volumes:
46-
- ./data/npm:/data
47-
- ./data/letsencrypt:/etc/letsencrypt
48-
depends_on:
49-
- mariadb
37+
# secrets:
38+
# - MYSQL_PWD
39+
# environment:
40+
# DISABLE_IPV6: 'true'
41+
# DB_MYSQL_HOST: "mariadb"
42+
# DB_MYSQL_PORT: 3306
43+
# MYSQL_DATABASE: "npm"
44+
# MYSQL_USER: "npm"
45+
# # MYSQL_PASSWORD: "npm"
46+
# MYSQL_PASSWORD__FILE: /run/secrets/MYSQL_PWD
47+
# volumes:
48+
# - ./data/npm:/data
49+
# - ./data/letsencrypt:/etc/letsencrypt
50+
# depends_on:
51+
# - mariadb

0 commit comments

Comments
 (0)