diff options
| author | Daniel Wiesenberg <weasy@hotmail.de> | 2021-08-09 21:21:18 +0200 |
|---|---|---|
| committer | Daniel Wiesenberg <weasy@hotmail.de> | 2021-08-09 21:21:18 +0200 |
| commit | a7b6af7caf4c4e01f3c0ddbccafb8fe27f2ab4ce (patch) | |
| tree | 51b25a859bb88a8bd8ec4f2e79b47862f11f6ab9 /docker | |
| parent | 1cbc61c55821633313b555bbe6ad6e25265325ae (diff) | |
| download | conduit-a7b6af7caf4c4e01f3c0ddbccafb8fe27f2ab4ce.zip | |
Bump version of alpine docker image to 3.14
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ci-binaries-packaging.Dockerfile | 5 | ||||
| -rw-r--r-- | docker/docker-compose.traefik.yml | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/docker/ci-binaries-packaging.Dockerfile b/docker/ci-binaries-packaging.Dockerfile index 43ebc98..797ef0c 100644 --- a/docker/ci-binaries-packaging.Dockerfile +++ b/docker/ci-binaries-packaging.Dockerfile @@ -7,7 +7,7 @@ # Credit's for the original Dockerfile: Weasy666. # --------------------------------------------------------------------------------------------------------- -FROM alpine:3.12 +FROM alpine:3.14 ARG CREATED ARG VERSION @@ -52,9 +52,6 @@ RUN apk add --no-cache \ curl \ libgcc -# Create a volume for the database, to persist its contents -VOLUME ["/srv/conduit/.local/share/conduit"] - # Test if Conduit is still alive, uses the same endpoint as Element HEALTHCHECK --start-period=5s \ CMD curl --fail -s "http://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \ diff --git a/docker/docker-compose.traefik.yml b/docker/docker-compose.traefik.yml index 3b36d10..58fa3ed 100644 --- a/docker/docker-compose.traefik.yml +++ b/docker/docker-compose.traefik.yml @@ -12,8 +12,8 @@ services: # build: # context: . # args: - # CREATED: - # VERSION: + # CREATED: '2021-03-16T08:18:27Z' + # VERSION: '0.1.0' # LOCAL: 'false' # GIT_REF: origin/master restart: unless-stopped @@ -28,9 +28,9 @@ services: CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name CONDUIT_TRUSTED_SERVERS: '["matrix.org"]' ### Uncomment and change values as desired - # CONDUIT_ADDRESS: 127.0.0.1 + # CONDUIT_ADDRESS: 0.0.0.0 # CONDUIT_PORT: 6167 - # CONDUIT_CONFIG: '/srv/conduit/conduit.toml' # if want to configure purely by env vars, set this to an empty string '' + # CONDUIT_CONFIG: '/srv/conduit/conduit.toml' # if you want to configure purely by env vars, set this to an empty string '' # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging # CONDUIT_LOG: info # default is: "info,rocket=off,_=off,sled=off" # CONDUIT_ALLOW_JAEGER: 'false' @@ -59,7 +59,7 @@ volumes: db: networks: - # This is the network Traefik listens to, if you network has a different + # This is the network Traefik listens to, if your network has a different # name, don't forget to change it here and in the docker-compose.override.yml proxy: external: true |