Skip to content

Commit

Permalink
we were unable to get build server happy with containerd multi platfo…
Browse files Browse the repository at this point in the history
…rm support
  • Loading branch information
jodygarnett committed Sep 24, 2024
1 parent c52cfbc commit 4137b23
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions build/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ else
fi
fi

# Prerequisite for Multi-Arch via QEMU:
docker run --privileged --rm tonistiigi/binfmt --install all
# Prerequisite for Multi-Arch via QEM
# docker run --privileged --rm tonistiigi/binfmt --install all

echo "Release from branch $BRANCH GeoServer $VERSION as $TAG"

Expand All @@ -63,20 +63,18 @@ if [[ $1 == *build* ]]; then
echo " nightly build from https://build.geoserver.org/geoserver/$BRANCH"
echo
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
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 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 GS_VERSION=$VERSION \
--build-arg GS_BUILD=$BUILD \
-t $TAG .
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 \
--platform linux/amd64,linux/arm64 \
--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 COMMUNITY_PLUGIN_URL=https://build.geoserver.org/geoserver/$BRANCH/community-latest \
Expand All @@ -85,9 +83,8 @@ if [[ $1 == *build* ]]; then
-t $TAG .
fi
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 \
--platform linux/amd64,linux/arm64 \
--build-arg GS_VERSION=$VERSION \
--build-arg GS_BUILD=$BUILD \
-t $TAG .
Expand Down

0 comments on commit 4137b23

Please sign in to comment.