From a7b6af7caf4c4e01f3c0ddbccafb8fe27f2ab4ce Mon Sep 17 00:00:00 2001 From: Daniel Wiesenberg Date: Mon, 9 Aug 2021 21:21:18 +0200 Subject: [PATCH] Bump version of alpine docker image to 3.14 --- Dockerfile | 12 ++---------- docker-compose.yml | 20 ++++++++++---------- docker/ci-binaries-packaging.Dockerfile | 5 +---- docker/docker-compose.traefik.yml | 10 +++++----- 4 files changed, 18 insertions(+), 29 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0eae25a..68dce3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ########################## BUILD IMAGE ########################## # Alpine build image to build Conduit's statically compiled binary -FROM alpine:3.12 as builder +FROM alpine:3.14 as builder # Specifies if the local project is build or if Conduit gets build # from the official git repository. Defaults to the git repo. @@ -13,11 +13,6 @@ ARG LOCAL=false # Specifies which revision/commit is build. Defaults to HEAD ARG GIT_REF=origin/master -# Add 'edge'-repository to get Rust 1.45 -RUN sed -i \ - -e 's|v3\.12|edge|' \ - /etc/apk/repositories - # Install packages needed for building all crates RUN apk add --no-cache \ cargo \ @@ -36,7 +31,7 @@ RUN if [[ $LOCAL == "true" ]]; then \ ########################## RUNTIME IMAGE ########################## # Create new stage with a minimal image for the actual # runtime image/container -FROM alpine:3.12 +FROM alpine:3.14 ARG CREATED ARG VERSION @@ -86,9 +81,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-compose.yml b/docker-compose.yml index d643709..3f8f832 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,19 +3,19 @@ version: '3' services: homeserver: - ### If you already built the Conduit image with 'docker build' or want to use the Docker Hub image, + ### If you already built the Conduit image with 'docker build' or want to use a registry image, ### then you are ready to go. - #image: matrixconduit/matrix-conduit:latest + image: matrixconduit/matrix-conduit:latest ### If you want to build a fresh image from the sources, then comment the image line and uncomment the ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this: ### 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 - build: - context: . - args: - CREATED: '2021-03-16T08:18:27Z' - VERSION: '0.1.0' - LOCAL: 'false' - GIT_REF: origin/master + # build: + # context: . + # args: + # CREATED: '2021-03-16T08:18:27Z' + # VERSION: '0.1.0' + # LOCAL: 'false' + # GIT_REF: origin/master restart: unless-stopped ports: - 8448:6167 @@ -28,7 +28,7 @@ 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 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 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