From 667f3df7b4150bb0b3039e058cbb25465c520e79 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 00:18:54 -0700 Subject: [PATCH 01/21] Refactor DDNS to support Google domains (via ddclient) --- .../config/cloudflare-ddns/docker-compose.yml | 21 ---------- server/config/ddns/.env | 1 + server/config/ddns/docker-compose.yml | 40 +++++++++++++++++++ 3 files changed, 41 insertions(+), 21 deletions(-) delete mode 100644 server/config/cloudflare-ddns/docker-compose.yml create mode 100644 server/config/ddns/.env create mode 100644 server/config/ddns/docker-compose.yml diff --git a/server/config/cloudflare-ddns/docker-compose.yml b/server/config/cloudflare-ddns/docker-compose.yml deleted file mode 100644 index 1736af9..0000000 --- a/server/config/cloudflare-ddns/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" -services: - cloudflare-ddns: - image: oznu/cloudflare-ddns - container_name: ddns_cloudflare-ddns - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" - - restart: "no" - environment: - - API_KEY=9DFsEwqVGRvcvKcpU7v5tORYIj-BmTJ-7zHonskl - - ZONE=jafner.net - - SUBDOMAIN=* - labels: - - traefik.enable=false diff --git a/server/config/ddns/.env b/server/config/ddns/.env new file mode 100644 index 0000000..5d781d4 --- /dev/null +++ b/server/config/ddns/.env @@ -0,0 +1 @@ +DOCKER_DATA=/home/joey/data/ddns \ No newline at end of file diff --git a/server/config/ddns/docker-compose.yml b/server/config/ddns/docker-compose.yml new file mode 100644 index 0000000..d0484a1 --- /dev/null +++ b/server/config/ddns/docker-compose.yml @@ -0,0 +1,40 @@ +version: "3" +services: + cloudflare: + image: oznu/cloudflare-ddns + container_name: ddns_cloudflare + logging: + driver: loki + options: + loki-url: http://localhost:3100/loki/api/v1/push + loki-batch-size: "50" + loki-retries: "1" + loki-timeout: "2s" + keep-file: "true" + restart: "no" + environment: + - API_KEY=9DFsEwqVGRvcvKcpU7v5tORYIj-BmTJ-7zHonskl + - ZONE=jafner.net + - SUBDOMAIN=* + labels: + - traefik.enable=false + ddclient: + image: linuxserver/ddclient + container_name: ddns_ddclient + logging: + driver: loki + options: + loki-url: http://localhost:3100/loki/api/v1/push + loki-batch-size: "50" + loki-retries: "1" + loki-timeout: "2s" + keep-file: "true" + restart: "no" + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/Los_Angeles + volumes: + - ${DOCKER_DATA}/ddclient:/config + labels: + - traefik.enable=false From a558a96f632acd816b5f27be7e7c34ef70627d35 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 00:21:10 -0700 Subject: [PATCH 02/21] Init megan-portfolio --- server/config/megan-portfolio/.env | 2 + .../config/megan-portfolio/docker-compose.yml | 44 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 server/config/megan-portfolio/.env create mode 100644 server/config/megan-portfolio/docker-compose.yml diff --git a/server/config/megan-portfolio/.env b/server/config/megan-portfolio/.env new file mode 100644 index 0000000..e29cd31 --- /dev/null +++ b/server/config/megan-portfolio/.env @@ -0,0 +1,2 @@ +DOCKER_DATA=/home/joey/data/megan-portfolio + diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml new file mode 100644 index 0000000..3b30616 --- /dev/null +++ b/server/config/megan-portfolio/docker-compose.yml @@ -0,0 +1,44 @@ +version: '3.1' + +services: + megan-portfolio: + image: wordpress + container_name: wordpress_megan-portfolio + restart: "no" + environment: + WORDPRESS_DB_HOST: portfolio_db + WORDPRESS_DB_USER: wordpress + WORDPRESS_DB_PASSWORD: wordpress + WORDPRESS_DB_NAME: wordpressdb + volumes: + - ${DOCKER_DATA}/html:/var/www/html + labels: + - traefik.http.routers.megan-portfolio.rule=Host(`meganmcdonough.art`) + - traefik.http.routers.megan-portfolio.tls.certresolver=lets-encrypt + - traefik.port=80 + networks: + - web + - portfolio + depends_on: + - portfolio_db + + portfolio_db: + image: mysql:5.7 + container_name: wordpress_portfolio-db + restart: "no" + networks: + - portfolio + environment: + MYSQL_DATABASE: wordpressdb + MYSQL_USER: wordpress + MYSQL_PASSWORD: wordpress + MYSQL_RANDOM_ROOT_PASSWORD: '1' + volumes: + - ${DOCKER_DATA}/db:/var/lib/mysql + labels: + - traefik.enable=false + +networks: + web: + external: true + portfolio: From 509c89165c37d30ddaec744848642444dd9ac9f5 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 00:38:12 -0700 Subject: [PATCH 03/21] Update ddns --- server/config/ddns/ddclient/ddclient.conf | 5 +++ server/config/ddns/docker-compose.yml | 41 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 server/config/ddns/ddclient/ddclient.conf create mode 100644 server/config/ddns/docker-compose.yml diff --git a/server/config/ddns/ddclient/ddclient.conf b/server/config/ddns/ddclient/ddclient.conf new file mode 100644 index 0000000..6c6b76a --- /dev/null +++ b/server/config/ddns/ddclient/ddclient.conf @@ -0,0 +1,5 @@ +protocol=googledomains +ssl=yes +login=ZFYexX5MWa3Fv574 +password=QQFEf55pK01iEFAd +*.jafner.dev \ No newline at end of file diff --git a/server/config/ddns/docker-compose.yml b/server/config/ddns/docker-compose.yml new file mode 100644 index 0000000..56e06cd --- /dev/null +++ b/server/config/ddns/docker-compose.yml @@ -0,0 +1,41 @@ +version: "3" +services: + cloudflare: + image: oznu/cloudflare-ddns + container_name: ddns_cloudflare + logging: + driver: loki + options: + loki-url: http://localhost:3100/loki/api/v1/push + loki-batch-size: "50" + loki-retries: "1" + loki-timeout: "2s" + keep-file: "true" + restart: "no" + environment: + - API_KEY=9DFsEwqVGRvcvKcpU7v5tORYIj-BmTJ-7zHonskl + - ZONE=jafner.net + - SUBDOMAIN=* + labels: + - traefik.enable=false + + ddclient: + image: linuxserver/ddclient + container_name: ddns_ddclient + logging: + driver: loki + options: + loki-url: http://localhost:3100/loki/api/v1/push + loki-batch-size: "50" + loki-retries: "1" + loki-timeout: "2s" + keep-file: "true" + restart: "no" + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/Los_Angeles + volumes: + - ${PWD}/ddclient:/config + labels: + - traefik.enable=false From 5bce86f18e063c99f5bcf605b2ba28b186de9759 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 00:38:59 -0700 Subject: [PATCH 04/21] Delete old ddns --- .../config/cloudflare-ddns/docker-compose.yml | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 server/config/cloudflare-ddns/docker-compose.yml diff --git a/server/config/cloudflare-ddns/docker-compose.yml b/server/config/cloudflare-ddns/docker-compose.yml deleted file mode 100644 index 1736af9..0000000 --- a/server/config/cloudflare-ddns/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" -services: - cloudflare-ddns: - image: oznu/cloudflare-ddns - container_name: ddns_cloudflare-ddns - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" - - restart: "no" - environment: - - API_KEY=9DFsEwqVGRvcvKcpU7v5tORYIj-BmTJ-7zHonskl - - ZONE=jafner.net - - SUBDOMAIN=* - labels: - - traefik.enable=false From 4e8b05d583585bf90c0d65261c0c76e25ebefea6 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 00:43:36 -0700 Subject: [PATCH 05/21] Enable use=web --- server/config/ddns/ddclient/ddclient.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/server/config/ddns/ddclient/ddclient.conf b/server/config/ddns/ddclient/ddclient.conf index 6c6b76a..d31d4f4 100644 --- a/server/config/ddns/ddclient/ddclient.conf +++ b/server/config/ddns/ddclient/ddclient.conf @@ -1,3 +1,4 @@ +use=web protocol=googledomains ssl=yes login=ZFYexX5MWa3Fv574 From bead8eb1f2eb2a1f68037f31d5540f740b5e08e5 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 00:46:39 -0700 Subject: [PATCH 06/21] Create nginx test for test.jafner.dev --- server/config/nginx/docker-compose.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 server/config/nginx/docker-compose.yml diff --git a/server/config/nginx/docker-compose.yml b/server/config/nginx/docker-compose.yml new file mode 100644 index 0000000..ab6d1de --- /dev/null +++ b/server/config/nginx/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3' +services: + nginx: + image: nginx + container_name: nginx_test-jafner-dev + networks: + - web + labels: + - traefik.http.routers.nginx.rule=Host(`test.jafner.dev`) + - traefik.http.routers.nginx.tls.certresolver=lets-encrypt + +networks: + web: + external: true From 620f936574afdf879e2cc22313f82323a2856232 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 15:14:21 -0700 Subject: [PATCH 07/21] Add meganmcdonough.art to ddconf --- server/config/ddns/ddclient/ddclient.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/config/ddns/ddclient/ddclient.conf b/server/config/ddns/ddclient/ddclient.conf index d31d4f4..8df1121 100644 --- a/server/config/ddns/ddclient/ddclient.conf +++ b/server/config/ddns/ddclient/ddclient.conf @@ -1,6 +1,14 @@ +# generic use=web protocol=googledomains ssl=yes + +# *.jafner.dev login=ZFYexX5MWa3Fv574 password=QQFEf55pK01iEFAd -*.jafner.dev \ No newline at end of file +*.jafner.dev + +# meganmcdonough.art +login=kmKcoyHWbZXuzuXq +password=ravo8xsnjb4pmVko +meganmcdonough.art \ No newline at end of file From 8df640e050d7c168f1867933f6f40529c920fc89 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 15:20:37 -0700 Subject: [PATCH 08/21] Update ddclient config --- server/config/ddns/ddclient/ddclient.conf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/config/ddns/ddclient/ddclient.conf b/server/config/ddns/ddclient/ddclient.conf index 8df1121..400a67b 100644 --- a/server/config/ddns/ddclient/ddclient.conf +++ b/server/config/ddns/ddclient/ddclient.conf @@ -1,14 +1,15 @@ -# generic +# *.jafner.dev use=web protocol=googledomains ssl=yes - -# *.jafner.dev login=ZFYexX5MWa3Fv574 password=QQFEf55pK01iEFAd -*.jafner.dev +@.jafner.dev, *.jafner.dev # meganmcdonough.art +use=web +protocol=googledomains +ssl=yes login=kmKcoyHWbZXuzuXq password=ravo8xsnjb4pmVko -meganmcdonough.art \ No newline at end of file +@.meganmcdonough.art \ No newline at end of file From 19b3311ff2331644262860ccb0c0dc2db52a7978 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 15:20:55 -0700 Subject: [PATCH 09/21] Switch from wp to nginx for testing dns routing --- .../config/megan-portfolio/docker-compose.yml | 75 +++++++++++-------- 1 file changed, 42 insertions(+), 33 deletions(-) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index 3b30616..e02d313 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -1,42 +1,51 @@ version: '3.1' services: - megan-portfolio: - image: wordpress - container_name: wordpress_megan-portfolio - restart: "no" - environment: - WORDPRESS_DB_HOST: portfolio_db - WORDPRESS_DB_USER: wordpress - WORDPRESS_DB_PASSWORD: wordpress - WORDPRESS_DB_NAME: wordpressdb - volumes: - - ${DOCKER_DATA}/html:/var/www/html - labels: - - traefik.http.routers.megan-portfolio.rule=Host(`meganmcdonough.art`) - - traefik.http.routers.megan-portfolio.tls.certresolver=lets-encrypt - - traefik.port=80 + nginx: + image: nginx + container_name: nginx_meganmcdonough-art networks: - web - - portfolio - depends_on: - - portfolio_db - - portfolio_db: - image: mysql:5.7 - container_name: wordpress_portfolio-db - restart: "no" - networks: - - portfolio - environment: - MYSQL_DATABASE: wordpressdb - MYSQL_USER: wordpress - MYSQL_PASSWORD: wordpress - MYSQL_RANDOM_ROOT_PASSWORD: '1' - volumes: - - ${DOCKER_DATA}/db:/var/lib/mysql labels: - - traefik.enable=false + - traefik.http.routers.nginx.rule=Host(`meganmcdonough.art`) + - traefik.http.routers.nginx.tls.certresolver=lets-encrypt + + # megan-portfolio: + # image: wordpress + # container_name: wordpress_megan-portfolio + # restart: "no" + # environment: + # WORDPRESS_DB_HOST: portfolio_db + # WORDPRESS_DB_USER: wordpress + # WORDPRESS_DB_PASSWORD: wordpress + # WORDPRESS_DB_NAME: wordpressdb + # volumes: + # - ${DOCKER_DATA}/html:/var/www/html + # labels: + # - traefik.http.routers.megan-portfolio.rule=Host(`meganmcdonough.art`) + # - traefik.http.routers.megan-portfolio.tls.certresolver=lets-encrypt + # - traefik.port=80 + # networks: + # - web + # - portfolio + # depends_on: + # - portfolio_db + + # portfolio_db: + # image: mysql:5.7 + # container_name: wordpress_portfolio-db + # restart: "no" + # networks: + # - portfolio + # environment: + # MYSQL_DATABASE: wordpressdb + # MYSQL_USER: wordpress + # MYSQL_PASSWORD: wordpress + # MYSQL_RANDOM_ROOT_PASSWORD: '1' + # volumes: + # - ${DOCKER_DATA}/db:/var/lib/mysql + # labels: + # - traefik.enable=false networks: web: From f41dd3e810254cdc57e465fc4cd82f4568f94ab8 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 15:45:01 -0700 Subject: [PATCH 10/21] Appease vscode compose linter --- server/config/megan-portfolio/docker-compose.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index e02d313..a16ef78 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -9,7 +9,12 @@ services: labels: - traefik.http.routers.nginx.rule=Host(`meganmcdonough.art`) - traefik.http.routers.nginx.tls.certresolver=lets-encrypt - + +networks: + web: + external: true + portfolio: + # megan-portfolio: # image: wordpress # container_name: wordpress_megan-portfolio @@ -47,7 +52,3 @@ services: # labels: # - traefik.enable=false -networks: - web: - external: true - portfolio: From cc6ac683c5b5f4b62a60a7a704c3108ea56c9014 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 15:45:10 -0700 Subject: [PATCH 11/21] Disable SSL on meganmcdonough.net --- server/config/ddns/ddclient/ddclient.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/config/ddns/ddclient/ddclient.conf b/server/config/ddns/ddclient/ddclient.conf index 400a67b..205a900 100644 --- a/server/config/ddns/ddclient/ddclient.conf +++ b/server/config/ddns/ddclient/ddclient.conf @@ -1,4 +1,4 @@ -# *.jafner.dev +# jafner.dev use=web protocol=googledomains ssl=yes @@ -9,7 +9,7 @@ password=QQFEf55pK01iEFAd # meganmcdonough.art use=web protocol=googledomains -ssl=yes +ssl=no login=kmKcoyHWbZXuzuXq password=ravo8xsnjb4pmVko @.meganmcdonough.art \ No newline at end of file From d0ba85598784968a3d0569d0240f7514f5dcd5a4 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 15:57:32 -0700 Subject: [PATCH 12/21] Add second nginx instance --- server/config/megan-portfolio/docker-compose.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index a16ef78..72e5390 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -9,6 +9,15 @@ services: labels: - traefik.http.routers.nginx.rule=Host(`meganmcdonough.art`) - traefik.http.routers.nginx.tls.certresolver=lets-encrypt + + nginx-test: + image: nginx + container_name: nginx_test + networks: + - web + labels: + - traefik.http.routers.nginx.rule=Host(`test.jafner.net`) + - traefik.http.routers.nginx.tls.certresolver=lets-encrypt networks: web: From 2b65327d78c5d3fce230441f6d38c590cd34de79 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 15:59:05 -0700 Subject: [PATCH 13/21] Fix router collision --- server/config/megan-portfolio/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index 72e5390..a9c84d5 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -16,8 +16,8 @@ services: networks: - web labels: - - traefik.http.routers.nginx.rule=Host(`test.jafner.net`) - - traefik.http.routers.nginx.tls.certresolver=lets-encrypt + - traefik.http.routers.nginx2.rule=Host(`test.jafner.net`) + - traefik.http.routers.nginx2.tls.certresolver=lets-encrypt networks: web: From 1cf176704a9a9b5776f3f44b8932e3b7a9199bfa Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 16:07:27 -0700 Subject: [PATCH 14/21] Update creds --- server/config/ddns/ddclient/ddclient.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/config/ddns/ddclient/ddclient.conf b/server/config/ddns/ddclient/ddclient.conf index 205a900..63f2e11 100644 --- a/server/config/ddns/ddclient/ddclient.conf +++ b/server/config/ddns/ddclient/ddclient.conf @@ -9,7 +9,7 @@ password=QQFEf55pK01iEFAd # meganmcdonough.art use=web protocol=googledomains -ssl=no -login=kmKcoyHWbZXuzuXq -password=ravo8xsnjb4pmVko +ssl=yes +login=s1KqF6PhZaPCRVKQ +password=a4I3bGMVLqzQOWzE @.meganmcdonough.art \ No newline at end of file From dc1384cdb880107c6f01a3048b590abfa347498e Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 16:11:03 -0700 Subject: [PATCH 15/21] Add explicit web endpoint --- server/config/ddns/ddclient/ddclient.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/config/ddns/ddclient/ddclient.conf b/server/config/ddns/ddclient/ddclient.conf index 63f2e11..c638a65 100644 --- a/server/config/ddns/ddclient/ddclient.conf +++ b/server/config/ddns/ddclient/ddclient.conf @@ -1,5 +1,6 @@ # jafner.dev use=web +web=dynamicdns.park-your-domain.com/getip protocol=googledomains ssl=yes login=ZFYexX5MWa3Fv574 @@ -8,6 +9,7 @@ password=QQFEf55pK01iEFAd # meganmcdonough.art use=web +web=dynamicdns.park-your-domain.com/getip protocol=googledomains ssl=yes login=s1KqF6PhZaPCRVKQ From 36ae68e3713ead81ff835d62e2ff7c06a82d9e5a Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 16:11:36 -0700 Subject: [PATCH 16/21] Switch from fqdn --- server/config/ddns/ddclient/ddclient.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/config/ddns/ddclient/ddclient.conf b/server/config/ddns/ddclient/ddclient.conf index c638a65..a18a3da 100644 --- a/server/config/ddns/ddclient/ddclient.conf +++ b/server/config/ddns/ddclient/ddclient.conf @@ -14,4 +14,4 @@ protocol=googledomains ssl=yes login=s1KqF6PhZaPCRVKQ password=a4I3bGMVLqzQOWzE -@.meganmcdonough.art \ No newline at end of file +meganmcdonough.art \ No newline at end of file From 162517226ed01e5b351af179b9a696e0b8e81332 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 16:16:55 -0700 Subject: [PATCH 17/21] Enable megan-portfolio wordpress --- .../config/megan-portfolio/docker-compose.yml | 88 ++++++++----------- 1 file changed, 35 insertions(+), 53 deletions(-) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index a9c84d5..0d95aed 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -1,63 +1,45 @@ version: '3.1' services: - nginx: - image: nginx - container_name: nginx_meganmcdonough-art - networks: - - web - labels: - - traefik.http.routers.nginx.rule=Host(`meganmcdonough.art`) - - traefik.http.routers.nginx.tls.certresolver=lets-encrypt - - nginx-test: - image: nginx - container_name: nginx_test - networks: - - web - labels: - - traefik.http.routers.nginx2.rule=Host(`test.jafner.net`) - - traefik.http.routers.nginx2.tls.certresolver=lets-encrypt - networks: web: external: true portfolio: - # megan-portfolio: - # image: wordpress - # container_name: wordpress_megan-portfolio - # restart: "no" - # environment: - # WORDPRESS_DB_HOST: portfolio_db - # WORDPRESS_DB_USER: wordpress - # WORDPRESS_DB_PASSWORD: wordpress - # WORDPRESS_DB_NAME: wordpressdb - # volumes: - # - ${DOCKER_DATA}/html:/var/www/html - # labels: - # - traefik.http.routers.megan-portfolio.rule=Host(`meganmcdonough.art`) - # - traefik.http.routers.megan-portfolio.tls.certresolver=lets-encrypt - # - traefik.port=80 - # networks: - # - web - # - portfolio - # depends_on: - # - portfolio_db + megan-portfolio: + image: wordpress + container_name: wordpress_megan-portfolio + restart: "no" + environment: + WORDPRESS_DB_HOST: portfolio_db + WORDPRESS_DB_USER: wordpress + WORDPRESS_DB_PASSWORD: wordpress + WORDPRESS_DB_NAME: wordpressdb + volumes: + - ${DOCKER_DATA}/html:/var/www/html + labels: + - traefik.http.routers.megan-portfolio.rule=Host(`meganmcdonough.art`) + - traefik.http.routers.megan-portfolio.tls.certresolver=lets-encrypt + - traefik.port=80 + networks: + - web + - portfolio + depends_on: + - portfolio_db - # portfolio_db: - # image: mysql:5.7 - # container_name: wordpress_portfolio-db - # restart: "no" - # networks: - # - portfolio - # environment: - # MYSQL_DATABASE: wordpressdb - # MYSQL_USER: wordpress - # MYSQL_PASSWORD: wordpress - # MYSQL_RANDOM_ROOT_PASSWORD: '1' - # volumes: - # - ${DOCKER_DATA}/db:/var/lib/mysql - # labels: - # - traefik.enable=false + portfolio_db: + image: mysql:5.7 + container_name: wordpress_portfolio-db + restart: "no" + networks: + - portfolio + environment: + MYSQL_DATABASE: wordpressdb + MYSQL_USER: wordpress + MYSQL_PASSWORD: wordpress + MYSQL_RANDOM_ROOT_PASSWORD: '1' + volumes: + - ${DOCKER_DATA}/db:/var/lib/mysql + labels: + - traefik.enable=false From b5366b7705d3557726f3a27909c9135404664fe6 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 16:17:27 -0700 Subject: [PATCH 18/21] Fix typo --- server/config/megan-portfolio/docker-compose.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index 0d95aed..5fbed4c 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -1,11 +1,6 @@ version: '3.1' services: -networks: - web: - external: true - portfolio: - megan-portfolio: image: wordpress container_name: wordpress_megan-portfolio @@ -43,3 +38,7 @@ networks: labels: - traefik.enable=false +networks: + web: + external: true + portfolio: \ No newline at end of file From 7b5ba9b090ea77fb1b8c51e040cd745c3395ccf5 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 16:18:27 -0700 Subject: [PATCH 19/21] Fix container name collision --- server/config/megan-portfolio/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index 5fbed4c..e937b0b 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -22,9 +22,9 @@ services: depends_on: - portfolio_db - portfolio_db: + megan-portfolio_db: image: mysql:5.7 - container_name: wordpress_portfolio-db + container_name: wordpress_megan-portfolio-db restart: "no" networks: - portfolio From f5cafa4e7663d7fa1c14ceb67ed6d00d1708aee0 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 16:18:44 -0700 Subject: [PATCH 20/21] Fix typo --- server/config/megan-portfolio/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index e937b0b..592b745 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -20,7 +20,7 @@ services: - web - portfolio depends_on: - - portfolio_db + - megan-portfolio_db megan-portfolio_db: image: mysql:5.7 From f8d30eed45af76bfe532487d18974f6979b65af0 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 16 Jul 2022 16:27:56 -0700 Subject: [PATCH 21/21] Fix typo --- server/config/megan-portfolio/docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/config/megan-portfolio/docker-compose.yml b/server/config/megan-portfolio/docker-compose.yml index 592b745..85dd380 100644 --- a/server/config/megan-portfolio/docker-compose.yml +++ b/server/config/megan-portfolio/docker-compose.yml @@ -6,7 +6,7 @@ services: container_name: wordpress_megan-portfolio restart: "no" environment: - WORDPRESS_DB_HOST: portfolio_db + WORDPRESS_DB_HOST: megan-portfolio_db WORDPRESS_DB_USER: wordpress WORDPRESS_DB_PASSWORD: wordpress WORDPRESS_DB_NAME: wordpressdb @@ -15,7 +15,6 @@ services: labels: - traefik.http.routers.megan-portfolio.rule=Host(`meganmcdonough.art`) - traefik.http.routers.megan-portfolio.tls.certresolver=lets-encrypt - - traefik.port=80 networks: - web - portfolio