Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

189 code server fixes #204

Merged
merged 5 commits into from
Feb 8, 2022
Merged

189 code server fixes #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a355bf
moved code server secrets config into secrets.yml file and updated th…
joshdentremont Dec 17, 2021
9a8502b
moved traefik to end of services list so that code server wont overri…
joshdentremont Dec 17, 2021
378027e
fixed typo in makefile that said serivces instead of services
joshdentremont Dec 17, 2021
39076d9
moved secrets variable back into docker-compose.code-server.yml so th…
joshdentremont Dec 17, 2021
efdbc25
moved all references to secrets for code server back into code server…
joshdentremont Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.code-server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down