diff --git a/Makefile b/Makefile index 214d4123b..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) $(TRAEFIK_SERVICE) $(SECRETS) $(CODE_SERVER_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 diff --git a/docker-compose.code-server.yml b/docker-compose.code-server.yml index dda8ef566..7dec7209f 100644 --- a/docker-compose.code-server.yml +++ b/docker-compose.code-server.yml @@ -10,7 +10,7 @@ networks: external: true secrets: CODE_SERVER_PASSWORD: - file: "./secrets/CODE_SERVER_PASSWORD" + file: "./secrets/live/CODE_SERVER_PASSWORD" services: code-server: environment: