diff options
author | 2023-09-26 17:59:38 -0700 | |
---|---|---|
committer | 2023-09-26 17:59:38 -0700 | |
commit | 80195557c9d6bb4c464f865276024e0e968644a9 (patch) | |
tree | 6ffd662d9b969d54d1e3a5710ce27c4ed4d68d75 | |
parent | 9e26485b04ca1356a9e28d9cb30fc2b3943fde18 (diff) | |
download | bun-80195557c9d6bb4c464f865276024e0e968644a9.tar.gz bun-80195557c9d6bb4c464f865276024e0e968644a9.tar.zst bun-80195557c9d6bb4c464f865276024e0e968644a9.zip |
Fix alpine image for arm64
-rw-r--r-- | .github/workflows/bun-release-canary.yml | 6 | ||||
-rw-r--r-- | dockerhub/alpine/Dockerfile | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/bun-release-canary.yml b/.github/workflows/bun-release-canary.yml index 854421337..d0349af2a 100644 --- a/.github/workflows/bun-release-canary.yml +++ b/.github/workflows/bun-release-canary.yml @@ -56,7 +56,7 @@ jobs: name: Release to NPM runs-on: ubuntu-latest needs: sign - if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.use-npm }} + if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.use-npm == 'true' }} permissions: contents: read defaults: @@ -84,7 +84,7 @@ jobs: name: Release to Dockerhub (${{ matrix.variant }}) runs-on: ubuntu-latest needs: sign - if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.use-docker }} + if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.use-docker == 'true' }} permissions: contents: read strategy: @@ -137,7 +137,7 @@ jobs: name: Upload to S3 runs-on: ubuntu-latest needs: sign - if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.use-s3 }} + if: ${{ github.event_name != 'workflow_dispatch' || github.event.inputs.use-s3 == 'true' }} permissions: contents: read defaults: diff --git a/dockerhub/alpine/Dockerfile b/dockerhub/alpine/Dockerfile index ae389cbf7..abf1d8cce 100644 --- a/dockerhub/alpine/Dockerfile +++ b/dockerhub/alpine/Dockerfile @@ -74,18 +74,18 @@ RUN apk --no-cache add \ --retry 5 \ || (echo "error: failed to download: glibc-bin v${GLIBC_VERSION}" && exit 1) \ && mv "glibc-bin-${GLIBC_VERSION}.apk" glibc-bin.apk ;; \ - aarch64) curl "https://raw.githubusercontent.com/squishyu/alpine-pkg-glibc-aarch64-bin/master/glibc-${GLIBC_VERSION}.apk" \ + aarch64) curl "https://raw.githubusercontent.com/squishyu/alpine-pkg-glibc-aarch64-bin/master/glibc-${GLIBC_VERSION_AARCH64}.apk" \ -fsSLO \ --compressed \ --retry 5 \ - || (echo "error: failed to download: glibc v${GLIBC_VERSION}" && exit 1) \ - && mv "glibc-${GLIBC_VERSION}.apk" glibc.apk \ - && curl "https://raw.githubusercontent.com/squishyu/alpine-pkg-glibc-aarch64-bin/master/glibc-bin-${GLIBC_VERSION}.apk" \ + || (echo "error: failed to download: glibc v${GLIBC_VERSION_AARCH64}" && exit 1) \ + && mv "glibc-${GLIBC_VERSION_AARCH64}.apk" glibc.apk \ + && curl "https://raw.githubusercontent.com/squishyu/alpine-pkg-glibc-aarch64-bin/master/glibc-bin-${GLIBC_VERSION_AARCH64}.apk" \ -fsSLO \ --compressed \ --retry 5 \ - || (echo "error: failed to download: glibc-bin v${GLIBC_VERSION}" && exit 1) \ - && mv "glibc-bin-${GLIBC_VERSION}.apk" glibc-bin.apk ;; \ + || (echo "error: failed to download: glibc-bin v${GLIBC_VERSION_AARCH64}" && exit 1) \ + && mv "glibc-bin-${GLIBC_VERSION_AARCH64}.apk" glibc-bin.apk ;; \ *) echo "error: unsupported architecture '$arch'"; exit 1 ;; \ esac |