diff --git a/docker-compose.override.traefik.yml b/docker-compose.override.traefik.yml index 3a772e1..8b4be50 100644 --- a/docker-compose.override.traefik.yml +++ b/docker-compose.override.traefik.yml @@ -5,7 +5,7 @@ services: homeserver: labels: - "traefik.enable=true" - - "traefik.docker.network=proxy" + - "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network - "traefik.http.routers.to-conduit.rule=Host(`.`)" # Change to the address on which Conduit is hosted - "traefik.http.routers.to-conduit.tls=true" @@ -14,7 +14,7 @@ services: element-web: labels: - "traefik.enable=true" - - "traefik.docker.network=proxy" + - "traefik.docker.network=proxy" # Change this to the name of your Traefik docker proxy network - "traefik.http.routers.to-element-web.rule=Host(`.`)" # Change to the address on which Element-Web is hosted - "traefik.http.routers.to-element-web.tls=true" diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index 9e8235d..8edc29c 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -3,7 +3,17 @@ version: '3' services: homeserver: + ### If you already built the Conduit image with 'docker build', then you are ready to + ### go. Otherwise, you need to comment the 'image' line and uncomment the 'build' lines + ### and run: CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d image: conduit_homeserver:latest + # build: + # context: . + # args: + # CREATED: + # VERSION: + # LOCAL: false + # GIT_REF: HEAD restart: unless-stopped volumes: - db:/srv/conduit/.local/share/conduit @@ -16,7 +26,7 @@ services: ROCKET_SERVER_NAME: localhost:8000 # replace with your own name ### Uncomment and change values as desired # ROCKET_LOG: normal # Available levels are: off, debug, normal, critical - # ROCKET_PORT: 14004 + # ROCKET_PORT: 8000 # ROCKET_REGISTRATION_DISABLED: 'true' # ROCKET_ENCRYPTION_DISABLED: 'true' # ROCKET_DATABASE_PATH: /srv/conduit/.local/share/conduit diff --git a/docker-compose.yml b/docker-compose.yml index 3a390aa..48470e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,17 @@ version: '3' services: homeserver: + ### If you already built the Conduit image with 'docker build', then you are ready to + ### go. Otherwise, you need to comment the 'image' line and uncomment the 'build' lines + ### and run: CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d image: conduit_homeserver:latest + # build: + # context: . + # args: + # CREATED: + # VERSION: + # LOCAL: "false" + # GIT_REF: HEAD restart: unless-stopped ports: - 8448:8000 @@ -16,7 +26,7 @@ services: ROCKET_SERVER_NAME: localhost:8000 # replace with your own name ### Uncomment and change values as desired # ROCKET_LOG: normal # Available levels are: off, debug, normal, critical - # ROCKET_PORT: 14004 + # ROCKET_PORT: 8000 # ROCKET_REGISTRATION_DISABLED: 'true' # ROCKET_ENCRYPTION_DISABLED: 'true' # ROCKET_DATABASE_PATH: /srv/conduit/.local/share/conduit