From 3a355bf0646d2c82f256dc1efc307c4b560ec18e Mon Sep 17 00:00:00 2001 From: Josh d'Entremont Date: Fri, 17 Dec 2021 15:20:10 -0400 Subject: [PATCH 1/5] moved code server secrets config into secrets.yml file and updated the path to the secret file --- docker-compose.code-server.yml | 5 ----- docker-compose.secrets.yml | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.code-server.yml b/docker-compose.code-server.yml index dda8ef566..f277814f7 100644 --- a/docker-compose.code-server.yml +++ b/docker-compose.code-server.yml @@ -8,9 +8,6 @@ networks: internal: true gateway: external: true -secrets: - CODE_SERVER_PASSWORD: - file: "./secrets/CODE_SERVER_PASSWORD" services: code-server: environment: @@ -40,8 +37,6 @@ services: - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-drupal_https.entrypoints=https - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-drupal_https.rule=Host(`${DOMAIN}`) - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-drupal_https.tls=true - secrets: - - CODE_SERVER_PASSWORD volumes: # Mount and serve contents of Drupal site. - type: volume diff --git a/docker-compose.secrets.yml b/docker-compose.secrets.yml index 8d77dbc26..4d4ac7c0e 100644 --- a/docker-compose.secrets.yml +++ b/docker-compose.secrets.yml @@ -8,6 +8,8 @@ secrets: file: "./secrets/live/ALPACA_ACTIVEMQ_PASSWORD" ALPACA_KARAF_ADMIN_PASSWORD: file: "./secrets/live/ALPACA_KARAF_ADMIN_PASSWORD" + CODE_SERVER_PASSWORD: + file: "./secrets/live/CODE_SERVER_PASSWORD" DB_ROOT_PASSWORD: file: "./secrets/live/DB_ROOT_PASSWORD" DRUPAL_DEFAULT_ACCOUNT_PASSWORD: @@ -44,6 +46,9 @@ services: cantaloupe: secrets: - TOMCAT_ADMIN_PASSWORD + code-server: + secrets: + - CODE_SERVER_PASSWORD drupal: secrets: - DB_ROOT_PASSWORD From 9a8502b2d04646b3b5f63b6b7594026e972fe7c3 Mon Sep 17 00:00:00 2001 From: Josh d'Entremont Date: Fri, 17 Dec 2021 15:44:20 -0400 Subject: [PATCH 2/5] moved traefik to end of services list so that code server wont override gateway network --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 214d4123b..9d6acc0eb 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ DATABASE_SERVICES := $(sort $(DATABASE_SERVICES)) # The services to be run (order is important), as services can override one # another. Traefik must be last if included as otherwise its network # definition for `gateway` will be overriden. -SERVICES := $(REQUIRED_SERIVCES) $(FCREPO_SERVICE) $(WATCHTOWER_SERVICE) $(ETCD_SERVICE) $(DATABASE_SERVICES) $(ENVIRONMENT) $(TRAEFIK_SERVICE) $(SECRETS) $(CODE_SERVER_SERVICE) +SERVICES := $(REQUIRED_SERIVCES) $(FCREPO_SERVICE) $(WATCHTOWER_SERVICE) $(ETCD_SERVICE) $(DATABASE_SERVICES) $(ENVIRONMENT) $(SECRETS) $(CODE_SERVER_SERVICE) $(TRAEFIK_SERVICE) default: download-default-certs docker-compose.yml pull From 378027e3e8fd978f7c5f422574072fd3bc792ef3 Mon Sep 17 00:00:00 2001 From: Josh d'Entremont Date: Fri, 17 Dec 2021 15:48:20 -0400 Subject: [PATCH 3/5] fixed typo in makefile that said serivces instead of services --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9d6acc0eb..1077b7d3e 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ export EXTERNAL_SERVICES := etcd watchtower traefik # The minimal set of docker-compose files required to be able to run anything. -REQUIRED_SERIVCES ?= activemq alpaca blazegraph cantaloupe crayfish crayfits drupal mariadb matomo solr +REQUIRED_SERVICES ?= activemq alpaca blazegraph cantaloupe crayfish crayfits drupal mariadb matomo solr ifeq ($(USE_SECRETS), true) SECRETS := secrets @@ -74,7 +74,7 @@ DATABASE_SERVICES := $(sort $(DATABASE_SERVICES)) # The services to be run (order is important), as services can override one # another. Traefik must be last if included as otherwise its network # definition for `gateway` will be overriden. -SERVICES := $(REQUIRED_SERIVCES) $(FCREPO_SERVICE) $(WATCHTOWER_SERVICE) $(ETCD_SERVICE) $(DATABASE_SERVICES) $(ENVIRONMENT) $(SECRETS) $(CODE_SERVER_SERVICE) $(TRAEFIK_SERVICE) +SERVICES := $(REQUIRED_SERVICES) $(FCREPO_SERVICE) $(WATCHTOWER_SERVICE) $(ETCD_SERVICE) $(DATABASE_SERVICES) $(ENVIRONMENT) $(SECRETS) $(CODE_SERVER_SERVICE) $(TRAEFIK_SERVICE) default: download-default-certs docker-compose.yml pull From 39076d9b06aa52e57295c83ee4a3abcc4cbb1f15 Mon Sep 17 00:00:00 2001 From: Josh d'Entremont Date: Fri, 17 Dec 2021 17:06:20 -0400 Subject: [PATCH 4/5] moved secrets variable back into docker-compose.code-server.yml so that it doesnt cause errors when code server is not a service --- docker-compose.code-server.yml | 2 ++ docker-compose.secrets.yml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.code-server.yml b/docker-compose.code-server.yml index f277814f7..1c59dab58 100644 --- a/docker-compose.code-server.yml +++ b/docker-compose.code-server.yml @@ -37,6 +37,8 @@ services: - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-drupal_https.entrypoints=https - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-drupal_https.rule=Host(`${DOMAIN}`) - traefik.http.routers.${COMPOSE_PROJECT_NAME-isle-dc}-drupal_https.tls=true + secrets: + - CODE_SERVER_PASSWORD volumes: # Mount and serve contents of Drupal site. - type: volume diff --git a/docker-compose.secrets.yml b/docker-compose.secrets.yml index 4d4ac7c0e..c2bb04740 100644 --- a/docker-compose.secrets.yml +++ b/docker-compose.secrets.yml @@ -46,9 +46,6 @@ services: cantaloupe: secrets: - TOMCAT_ADMIN_PASSWORD - code-server: - secrets: - - CODE_SERVER_PASSWORD drupal: secrets: - DB_ROOT_PASSWORD From efdbc25b7a2d09bb6c81335def0992cb6148a556 Mon Sep 17 00:00:00 2001 From: Josh d'Entremont Date: Wed, 12 Jan 2022 15:35:48 -0400 Subject: [PATCH 5/5] moved all references to secrets for code server back into code servers yml file --- docker-compose.code-server.yml | 3 +++ docker-compose.secrets.yml | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.code-server.yml b/docker-compose.code-server.yml index 1c59dab58..7dec7209f 100644 --- a/docker-compose.code-server.yml +++ b/docker-compose.code-server.yml @@ -8,6 +8,9 @@ networks: internal: true gateway: external: true +secrets: + CODE_SERVER_PASSWORD: + file: "./secrets/live/CODE_SERVER_PASSWORD" services: code-server: environment: diff --git a/docker-compose.secrets.yml b/docker-compose.secrets.yml index c2bb04740..8d77dbc26 100644 --- a/docker-compose.secrets.yml +++ b/docker-compose.secrets.yml @@ -8,8 +8,6 @@ secrets: file: "./secrets/live/ALPACA_ACTIVEMQ_PASSWORD" ALPACA_KARAF_ADMIN_PASSWORD: file: "./secrets/live/ALPACA_KARAF_ADMIN_PASSWORD" - CODE_SERVER_PASSWORD: - file: "./secrets/live/CODE_SERVER_PASSWORD" DB_ROOT_PASSWORD: file: "./secrets/live/DB_ROOT_PASSWORD" DRUPAL_DEFAULT_ACCOUNT_PASSWORD: