diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 839c724..906e989 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -95,9 +95,8 @@ jobs: tags: | boky/postfix:latest boky/postfix:latest-alpine - # linux/386: WARNING: Ignoring https://dl-cdn.alpinelinux.org/alpine/v3.15/main: UNTRUSTED signature # linux/s390x: "rsyslog (no such package)" - platforms: "linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" + platforms: "linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" cache-from: type=local,src=/tmp/.buildx-cache/alpine cache-to: type=local,dest=/tmp/.buildx-cache-new/alpine build-args: | diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml index da1875e..5573c33 100644 --- a/.github/workflows/tags.yml +++ b/.github/workflows/tags.yml @@ -95,9 +95,8 @@ jobs: tags: | boky/postfix:${{ env.RELEASE_VERSION }} boky/postfix:${{ env.RELEASE_VERSION }}-alpine - # linux/386: WARNING: Ignoring https://dl-cdn.alpinelinux.org/alpine/v3.15/main: UNTRUSTED signature # linux/s390x: "rsyslog (no such package)" - platforms: "linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" + platforms: "linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le" cache-from: type=local,src=/tmp/.buildx-cache/alpine cache-to: type=local,dest=/tmp/.buildx-cache-new/alpine build-args: | diff --git a/build.sh b/build.sh index 6bbda6c..2a93507 100755 --- a/build.sh +++ b/build.sh @@ -10,13 +10,14 @@ declare cache_dir declare arg_list if [[ "$CI" == "true" ]]; then - cache_form="/tmp/.buildx-cache/alpine" - cache_to="/tmp/.buildx-cache-new/alpine" -else - cache_from="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/cache" - cache_to="${cache_from}" + if [[ -f "/tmp/.buildx-cache/alpine/index.json" ]]; then + arg_list="$arg_list --cache-from type=local,src=/tmp/.buildx-cache/alpine/index.json" + fi fi +cache_from="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/cache" +cache_to="${cache_from}" + if ! docker buildx inspect multiarch > /dev/null; then docker buildx create --name multiarch fi