Some testing

BlackDex · Jun 19, 2024 · 7adccaf · 7adccaf
1 parent f5d38d5
commit 7adccaf
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 30 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -168,11 +168,11 @@ jobs:
           fi
           #
 
-      - name: Add localhost registry
-        if: ${{ matrix.base_image == 'alpine' }}
-        shell: bash
-        run: |
-          echo "CONTAINER_REGISTRIES=${CONTAINER_REGISTRIES:+${CONTAINER_REGISTRIES},}localhost:5000/vaultwarden/server" | tee -a "${GITHUB_ENV}"
+      # - name: Add localhost registry
+      #   if: ${{ matrix.base_image == 'alpine' }}
+      #   shell: bash
+      #   run: |
+      #     echo "CONTAINER_REGISTRIES=${CONTAINER_REGISTRIES:+${CONTAINER_REGISTRIES},}localhost:5000/vaultwarden/server" | tee -a "${GITHUB_ENV}"
 
       - name: Bake ${{ matrix.base_image }} containers
         uses: docker/bake-action@6460b33ba7ba95e2dfe2fd545b1b9bbb347e9735 # v5.0.0
@@ -213,17 +213,17 @@ jobs:
           docker rm --force amd64
           docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
 
-          # Extract arm64 binary
-          docker create --name arm64 --platform=linux/arm64 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
-          docker cp arm64:/vaultwarden vaultwarden-arm64
-          docker rm --force arm64
-          docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
+          # # Extract arm64 binary
+          # docker create --name arm64 --platform=linux/arm64 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
+          # docker cp arm64:/vaultwarden vaultwarden-arm64
+          # docker rm --force arm64
+          # docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
 
-          # Extract armv7 binary
-          docker create --name armv7 --platform=linux/arm/v7 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
-          docker cp armv7:/vaultwarden vaultwarden-armv7
-          docker rm --force armv7
-          docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
+          # # Extract armv7 binary
+          # docker create --name armv7 --platform=linux/arm/v7 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
+          # docker cp armv7:/vaultwarden vaultwarden-armv7
+          # docker rm --force armv7
+          # docker rmi --force "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
 
           # Extract armv6 binary
           docker create --name armv6 --platform=linux/arm/v6 "localhost:5000/vaultwarden/server:${EXTRACT_TAG}-alpine"
@@ -239,19 +239,19 @@ jobs:
           name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-amd64
           path: vaultwarden-amd64
 
-      - name: "Upload arm64 artifact"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
-        if: ${{ matrix.base_image == 'alpine' }}
-        with:
-          name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-arm64
-          path: vaultwarden-arm64
+      # - name: "Upload arm64 artifact"
+      #   uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+      #   if: ${{ matrix.base_image == 'alpine' }}
+      #   with:
+      #     name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-arm64
+      #     path: vaultwarden-arm64
 
-      - name: "Upload armv7 artifact"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
-        if: ${{ matrix.base_image == 'alpine' }}
-        with:
-          name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-armv7
-          path: vaultwarden-armv7
+      # - name: "Upload armv7 artifact"
+      #   uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+      #   if: ${{ matrix.base_image == 'alpine' }}
+      #   with:
+      #     name: vaultwarden-${{ env.SOURCE_VERSION }}-linux-armv7
+      #     path: vaultwarden-armv7
 
       - name: "Upload armv6 artifact"
         uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl
@@ -95,7 +95,8 @@ target "debian" {
 // This is mainly used by GitHub Actions to build and push new containers
 target "debian-multi" {
   inherits = ["debian"]
-  platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/arm/v6"]
+  // platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/arm/v6"]
+  platforms = ["linux/amd64", "linux/arm/v6"]
   tags = generate_tags("", "")
   output = [join(",", flatten([["type=registry"], image_index_annotations()]))]
 }