From 3bbbecab020199f635e82979f39d385e84646ca9 Mon Sep 17 00:00:00 2001 From: Timshel Date: Mon, 8 Jan 2024 16:29:02 +0100 Subject: [PATCH] Publish to docker at oidcwarden/vaultwarden-oidc --- .github/workflows/release.yml | 23 ++++++++++++----------- docker/Dockerfile.alpine | 4 ++-- docker/Dockerfile.debian | 4 ++-- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4beab82c1a5..fbc8ee62ff9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: # We will skip this check if we are creating a tag, because that has the same hash as a previous run already. skip_check: runs-on: ubuntu-22.04 - if: ${{ github.repository == 'dani-garcia/vaultwarden' }} + if: ${{ github.repository == 'timshel/vaultwarden' }} outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} steps: @@ -38,9 +38,10 @@ jobs: docker-build: runs-on: ubuntu-22.04 + environment: main timeout-minutes: 120 needs: skip_check - if: ${{ needs.skip_check.outputs.should_skip != 'true' && github.repository == 'dani-garcia/vaultwarden' }} + if: ${{ needs.skip_check.outputs.should_skip != 'true' && github.repository == 'timshel/vaultwarden' }} # Start a local docker registry to extract the final Alpine static build binaries services: registry: @@ -178,7 +179,7 @@ jobs: if: ${{ matrix.base_image == 'alpine' }} shell: bash run: | - echo "CONTAINER_REGISTRIES=${CONTAINER_REGISTRIES:+${CONTAINER_REGISTRIES},}localhost:5000/vaultwarden/server" | tee -a "${GITHUB_ENV}" + echo "CONTAINER_REGISTRIES=${CONTAINER_REGISTRIES:+${CONTAINER_REGISTRIES},}localhost:5000/oidcwarden/vaultwarden-oidc" | tee -a "${GITHUB_ENV}" - name: Bake ${{ matrix.base_image }} containers uses: docker/bake-action@849707117b03d39aba7924c50a10376a69e88d7d # v4.1.0 @@ -214,28 +215,28 @@ jobs: # This is needed because using different platforms doesn't trigger a new pull/download # Extract amd64 binary - docker create --name amd64 --platform=linux/amd64 "vaultwarden/server:${EXTRACT_TAG}-alpine" + docker create --name amd64 --platform=linux/amd64 "oidcwarden/vaultwarden-oidc:${EXTRACT_TAG}-alpine" docker cp amd64:/vaultwarden vaultwarden-amd64 docker rm --force amd64 - docker rmi --force "vaultwarden/server:${EXTRACT_TAG}-alpine" + docker rmi --force "oidcwarden/vaultwarden-oidc:${EXTRACT_TAG}-alpine" # Extract arm64 binary - docker create --name arm64 --platform=linux/arm64 "vaultwarden/server:${EXTRACT_TAG}-alpine" + docker create --name arm64 --platform=linux/arm64 "oidcwarden/vaultwarden-oidc:${EXTRACT_TAG}-alpine" docker cp arm64:/vaultwarden vaultwarden-arm64 docker rm --force arm64 - docker rmi --force "vaultwarden/server:${EXTRACT_TAG}-alpine" + docker rmi --force "oidcwarden/vaultwarden-oidc:${EXTRACT_TAG}-alpine" # Extract armv7 binary - docker create --name armv7 --platform=linux/arm/v7 "vaultwarden/server:${EXTRACT_TAG}-alpine" + docker create --name armv7 --platform=linux/arm/v7 "oidcwarden/vaultwarden-oidc:${EXTRACT_TAG}-alpine" docker cp armv7:/vaultwarden vaultwarden-armv7 docker rm --force armv7 - docker rmi --force "vaultwarden/server:${EXTRACT_TAG}-alpine" + docker rmi --force "oidcwarden/vaultwarden-oidc:${EXTRACT_TAG}-alpine" # Extract armv6 binary - docker create --name armv6 --platform=linux/arm/v6 "vaultwarden/server:${EXTRACT_TAG}-alpine" + docker create --name armv6 --platform=linux/arm/v6 "oidcwarden/vaultwarden-oidc:${EXTRACT_TAG}-alpine" docker cp armv6:/vaultwarden vaultwarden-armv6 docker rm --force armv6 - docker rmi --force "vaultwarden/server:${EXTRACT_TAG}-alpine" + docker rmi --force "oidcwarden/vaultwarden-oidc:${EXTRACT_TAG}-alpine" # Upload artifacts to Github Actions - name: "Upload amd64 artifact" diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 88fc9dac4e2..52532c6f09a 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -37,9 +37,9 @@ ENV DEBIAN_FRONTEND=noninteractive \ # Get both version of the front-end -RUN wget -c https://github.com/Timshel/oidc_web_builds/releases/latest/download/oidc_button_web_vault.tar.gz -O - | tar -xz \ +RUN wget -c --progress=dot:giga https://github.com/Timshel/oidc_web_builds/releases/latest/download/oidc_button_web_vault.tar.gz -O - | tar -xz \ ; mv web-vault web-vault_button -RUN wget -c https://github.com/Timshel/oidc_web_builds/releases/latest/download/oidc_override_web_vault.tar.gz -O - | tar -xz \ +RUN wget -c --progress=dot:giga https://github.com/Timshel/oidc_web_builds/releases/latest/download/oidc_override_web_vault.tar.gz -O - | tar -xz \ ; mv web-vault web-vault_override # Create CARGO_HOME folder and don't download rust docs diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 328a1788149..185672fc6f7 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -62,9 +62,9 @@ RUN xx-apt-get install -y \ dpkg --force-all -i ./libmariadb-dev*.deb # Get both version of the front-end -RUN wget -c https://github.com/Timshel/oidc_web_builds/releases/latest/download/oidc_button_web_vault.tar.gz -O - | tar -xz \ +RUN wget -c --progress=dot:giga https://github.com/Timshel/oidc_web_builds/releases/latest/download/oidc_button_web_vault.tar.gz -O - | tar -xz \ ; mv web-vault web-vault_button -RUN wget -c https://github.com/Timshel/oidc_web_builds/releases/latest/download/oidc_override_web_vault.tar.gz -O - | tar -xz \ +RUN wget -c --progress=dot:giga https://github.com/Timshel/oidc_web_builds/releases/latest/download/oidc_override_web_vault.tar.gz -O - | tar -xz \ ; mv web-vault web-vault_override # Create CARGO_HOME folder and don't download rust docs