char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Bump version of alpine docker image to 3.14

Browse source
This commit is contained in:
Daniel Wiesenberg 2021-08-09 21:21:18 +02:00
parent 1cbc61c558
commit a7b6af7caf
4 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Dockerfile
View file

@ -5,7 +5,7 @@
########################## BUILD IMAGE ########################## ########################## BUILD IMAGE ##########################
# Alpine build image to build Conduit's statically compiled binary # 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 # Specifies if the local project is build or if Conduit gets build
# from the official git repository. Defaults to the git repo. # 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 # Specifies which revision/commit is build. Defaults to HEAD
ARG GIT_REF=origin/master 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 # Install packages needed for building all crates
RUN apk add --no-cache \ RUN apk add --no-cache \
cargo \ cargo \
@ -36,7 +31,7 @@ RUN if [[ $LOCAL == "true" ]]; then \
########################## RUNTIME IMAGE ########################## ########################## RUNTIME IMAGE ##########################
# Create new stage with a minimal image for the actual # Create new stage with a minimal image for the actual
# runtime image/container # runtime image/container
FROM alpine:3.12 FROM alpine:3.14
ARG CREATED ARG CREATED
ARG VERSION ARG VERSION
@ -86,9 +81,6 @@ RUN apk add --no-cache \
curl \ curl \
libgcc 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 # Test if Conduit is still alive, uses the same endpoint as Element
HEALTHCHECK --start-period=5s \ 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" || \ CMD curl --fail -s "http://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \

20
docker-compose.yml
View file

@ -3,19 +3,19 @@ version: '3'
services: services:
homeserver: 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. ### 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 ### 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: ### 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 ### 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: # build:
context: . # context: .
args: # args:
CREATED: '2021-03-16T08:18:27Z' # CREATED: '2021-03-16T08:18:27Z'
VERSION: '0.1.0' # VERSION: '0.1.0'
LOCAL: 'false' # LOCAL: 'false'
GIT_REF: origin/master # GIT_REF: origin/master
restart: unless-stopped restart: unless-stopped
ports: ports:
- 8448:6167 - 8448:6167
@ -28,7 +28,7 @@ services:
CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name
CONDUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
### Uncomment and change values as desired ### Uncomment and change values as desired
# CONDUIT_ADDRESS: 127.0.0.1 # CONDUIT_ADDRESS: 0.0.0.0
# CONDUIT_PORT: 6167 # CONDUIT_PORT: 6167
# CONDUIT_CONFIG: '/srv/conduit/conduit.toml' # if you 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 # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging

5
docker/ci-binaries-packaging.Dockerfile
View file

@ -7,7 +7,7 @@
# Credit's for the original Dockerfile: Weasy666. # Credit's for the original Dockerfile: Weasy666.
# --------------------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------------------
FROM alpine:3.12 FROM alpine:3.14
ARG CREATED ARG CREATED
ARG VERSION ARG VERSION
@ -52,9 +52,6 @@ RUN apk add --no-cache \
curl \ curl \
libgcc 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 # Test if Conduit is still alive, uses the same endpoint as Element
HEALTHCHECK --start-period=5s \ 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" || \ CMD curl --fail -s "http://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \

10
docker/docker-compose.traefik.yml
View file

@ -12,8 +12,8 @@ services:
# build: # build:
# context: . # context: .
# args: # args:
# CREATED: # CREATED: '2021-03-16T08:18:27Z'
# VERSION: # VERSION: '0.1.0'
# LOCAL: 'false' # LOCAL: 'false'
# GIT_REF: origin/master # GIT_REF: origin/master
restart: unless-stopped restart: unless-stopped
@ -28,9 +28,9 @@ services:
CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name
CONDUIT_TRUSTED_SERVERS: '["matrix.org"]' CONDUIT_TRUSTED_SERVERS: '["matrix.org"]'
### Uncomment and change values as desired ### Uncomment and change values as desired
# CONDUIT_ADDRESS: 127.0.0.1 # CONDUIT_ADDRESS: 0.0.0.0
# CONDUIT_PORT: 6167 # 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 # 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_LOG: info # default is: "info,rocket=off,_=off,sled=off"
# CONDUIT_ALLOW_JAEGER: 'false' # CONDUIT_ALLOW_JAEGER: 'false'
@ -59,7 +59,7 @@ volumes:
db: db:
networks: 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 # name, don't forget to change it here and in the docker-compose.override.yml
proxy: proxy:
external: true external: true