we were unable to get build server happy with containerd multi platform support

pull/99/head
Jody Garnett 2024-09-24 12:02:22 -07:00
parent c52cfbce49
commit 4137b23869
1 changed files with 5 additions and 8 deletions

View File

@ -49,8 +49,8 @@ else
fi fi
fi fi
# Prerequisite for Multi-Arch via QEMU: # Prerequisite for Multi-Arch via QEM
docker run --privileged --rm tonistiigi/binfmt --install all # docker run --privileged --rm tonistiigi/binfmt --install all
echo "Release from branch $BRANCH GeoServer $VERSION as $TAG" echo "Release from branch $BRANCH GeoServer $VERSION as $TAG"
@ -63,10 +63,9 @@ if [[ $1 == *build* ]]; then
echo " nightly build from https://build.geoserver.org/geoserver/$BRANCH" echo " nightly build from https://build.geoserver.org/geoserver/$BRANCH"
echo echo
if [[ "$BRANCH" == "main" ]]; then if [[ "$BRANCH" == "main" ]]; then
echo "docker build --platform linux/amd64,linux/arm64 --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ." echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
# todo: --no-cache-filter download,install # todo: --no-cache-filter download,install
docker build \ docker build \
--platform linux/amd64,linux/arm64 \
--build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/main/geoserver-main-latest-war.zip \ --build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/main/geoserver-main-latest-war.zip \
--build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/main/ext-latest \ --build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/main/ext-latest \
--build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/main/community-latest \ --build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/main/community-latest \
@ -74,9 +73,8 @@ if [[ $1 == *build* ]]; then
--build-arg GS_BUILD=$BUILD \ --build-arg GS_BUILD=$BUILD \
-t $TAG . -t $TAG .
else else
echo "docker build --platform linux/amd64,linux/arm64 --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ." echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
docker build \ docker build \
--platform linux/amd64,linux/arm64 \
--build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/$BRANCH/geoserver-$BRANCH-latest-war.zip \ --build-arg WAR_ZIP_URL=https://build.geoserver.org/geoserver/$BRANCH/geoserver-$BRANCH-latest-war.zip \
--build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/ext-latest \ --build-arg STABLE_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/ext-latest \
--build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/community-latest \ --build-arg COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/community-latest \
@ -85,9 +83,8 @@ if [[ $1 == *build* ]]; then
-t $TAG . -t $TAG .
fi fi
else else
echo "docker build --platform linux/amd64,linux/arm64 --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ." echo "docker build --build-arg GS_VERSION=$VERSION --build-arg GS_BUILD=$BUILD -t $TAG ."
docker build \ docker build \
--platform linux/amd64,linux/arm64 \
--build-arg GS_VERSION=$VERSION \ --build-arg GS_VERSION=$VERSION \
--build-arg GS_BUILD=$BUILD \ --build-arg GS_BUILD=$BUILD \
-t $TAG . -t $TAG .