aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-12-27 20:09:22 -0800
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-12-27 20:09:22 -0800
commitcac19d9e8b9cb9f4225da9a7ba3ab7015a6d7d80 (patch)
tree392cec9220973b8217f6cff4029027d3210201b2
parent1d03df7d330854ad33cd7e036691309601ee4102 (diff)
downloadbun-cac19d9e8b9cb9f4225da9a7ba3ab7015a6d7d80.tar.gz
bun-cac19d9e8b9cb9f4225da9a7ba3ab7015a6d7d80.tar.zst
bun-cac19d9e8b9cb9f4225da9a7ba3ab7015a6d7d80.zip
Set platform when pulling
-rw-r--r--.docker/pull.sh10
-rw-r--r--.github/workflows/bun.yml5
2 files changed, 13 insertions, 2 deletions
diff --git a/.docker/pull.sh b/.docker/pull.sh
new file mode 100644
index 000000000..3a5e0b25c
--- /dev/null
+++ b/.docker/pull.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euxo pipefail
+
+docker pull bunbunbunbun/bun-test-base:latest --platform=linux/amd64
+docker pull bunbunbunbun/bun-base:latest --platform=linux/amd64
+docker pull bunbunbunbun/bun-base-with-zig-and-webkit:latest --platform=linux/amd64
+
+docker tag bun-base:latest bunbunbunbun/bun-base
+docker tag bun-base-with-zig-and-webkit:latest bunbunbunbun/bun-base-with-zig-and-webkit:latest
diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml
index c196bd243..720d7cffb 100644
--- a/.github/workflows/bun.yml
+++ b/.github/workflows/bun.yml
@@ -37,8 +37,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
- name: Pull Base Image
- if: steps.cache-builds.outputs.cache-hit != 'true'
- run: docker pull bunbunbunbun/bun-test-base:latest && docker pull bunbunbunbun/bun-base:latest && docker pull bunbunbunbun/bun-base-with-zig-and-webkit:latest && docker tag bun-base:latest bunbunbunbun/bun-base && docker tag bun-base-with-zig-and-webkit:latest bunbunbunbun/bun-base-with-zig-and-webkit:latest
+ run: bash .docker/pull.sh
- name: Build Release Image
uses: docker/build-push-action@v2
with:
@@ -114,6 +113,8 @@ jobs:
uses: docker/setup-buildx-action@v1
with:
install: true
+ - name: Pull Base Image
+ run: bash .docker/pull.sh
- name: Build release image
uses: docker/build-push-action@v2
with: