diff options
| author | BlackDex <[email protected]> | 2023-03-23 12:30:07 +0100 |
|---|---|---|
| committer | BlackDex <[email protected]> | 2023-03-23 16:38:27 +0100 |
| commit | 467ecfdc999932963f70c06763ba75da5f8ce4d6 (patch) | |
| tree | 4cab1f378b67b020755409059adcddbcad6e65b5 /docker/Dockerfile.j2 | |
| parent | 5800aceb2d065a23899d277f91865f1d5b9ef297 (diff) | |
| download | vaultwarden-467ecfdc999932963f70c06763ba75da5f8ce4d6.tar.gz vaultwarden-467ecfdc999932963f70c06763ba75da5f8ce4d6.zip | |
Add support for Quay.io and GHCR.io as registries
- Added support for Quay.io
- Added support for GHCR.io
To enable support for these container image registries the following needs to be added.
As `Actions secrets and variables` - `Secrets`
- `DOCKERHUB_TOKEN` and `DOCKERHUB_USERNAME`
- `QUAY_TOKEN` and `QUAY_USERNAME`
As `Actions secrets and variables` - `Variables` - `Repository Variables`
- `DOCKERHUB_REPO`
- `GHCR_REPO`
- `QUAY_REPO`
The `DOCKERHUB_REPO` currently configured in `Secrets` can be removed if wanted, probably best after this PR has been merged.
If one of the vars/secrets are not configured it will skip that specific registry!
Diffstat (limited to 'docker/Dockerfile.j2')
| -rw-r--r-- | docker/Dockerfile.j2 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index d4182ddb..3d356c6c 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -3,22 +3,22 @@ # This file was generated using a Jinja2 template. # Please make your changes in `Dockerfile.j2` and then `make` the individual Dockerfiles. -{% set build_stage_base_image = "rust:1.67.1-bullseye" %} +{% set build_stage_base_image = "rust:1.68.1-bullseye" %} {% if "alpine" in target_file %} {% if "amd64" in target_file %} -{% set build_stage_base_image = "blackdex/rust-musl:x86_64-musl-stable-1.67.1" %} +{% set build_stage_base_image = "blackdex/rust-musl:x86_64-musl-stable-1.68.1" %} {% set runtime_stage_base_image = "alpine:3.17" %} {% set package_arch_target = "x86_64-unknown-linux-musl" %} {% elif "armv7" in target_file %} -{% set build_stage_base_image = "blackdex/rust-musl:armv7-musleabihf-stable-1.67.1" %} +{% set build_stage_base_image = "blackdex/rust-musl:armv7-musleabihf-stable-1.68.1" %} {% set runtime_stage_base_image = "balenalib/armv7hf-alpine:3.17" %} {% set package_arch_target = "armv7-unknown-linux-musleabihf" %} {% elif "armv6" in target_file %} -{% set build_stage_base_image = "blackdex/rust-musl:arm-musleabi-stable-1.67.1" %} +{% set build_stage_base_image = "blackdex/rust-musl:arm-musleabi-stable-1.68.1" %} {% set runtime_stage_base_image = "balenalib/rpi-alpine:3.17" %} {% set package_arch_target = "arm-unknown-linux-musleabi" %} {% elif "arm64" in target_file %} -{% set build_stage_base_image = "blackdex/rust-musl:aarch64-musl-stable-1.67.1" %} +{% set build_stage_base_image = "blackdex/rust-musl:aarch64-musl-stable-1.68.1" %} {% set runtime_stage_base_image = "balenalib/aarch64-alpine:3.17" %} {% set package_arch_target = "aarch64-unknown-linux-musl" %} {% endif %} |