File build.patch of Package portainer
Only in portainer-2.25.1+git.0.60ca183/build/: build_binary.sh.orig
Only in portainer-2.25.1+git.0.60ca183/build/: build_binary.sh.rej
diff -ur portainer/build/download_docker_binary.sh portainer-2.25.1+git.0.60ca183/build/download_docker_binary.sh
--- portainer/build/download_docker_binary.sh 2025-02-20 14:18:29.049234635 +0100
+++ portainer-2.25.1+git.0.60ca183/build/download_docker_binary.sh 2025-02-20 14:21:53.226366587 +0100
@@ -27,6 +27,11 @@
DOCKER_VERSION="18.06.3-ce"
fi
+# don't care about downloads in OBS
+if [[ -d /.build ]]; then
+ exit
+fi
+
rm -rf "${DOWNLOAD_FOLDER}"
mkdir -pv "${DOWNLOAD_FOLDER}"
diff -ur portainer/build/download_helm_binary.sh portainer-2.25.1+git.0.60ca183/build/download_helm_binary.sh
--- portainer/build/download_helm_binary.sh 2025-02-20 14:18:29.049234635 +0100
+++ portainer-2.25.1+git.0.60ca183/build/download_helm_binary.sh 2025-02-20 14:35:27.298326983 +0100
@@ -11,6 +11,10 @@
HELM_VERSION=$3
HELM_DIST="helm-$HELM_VERSION-$PLATFORM-$ARCH"
+# don't care about downloads in OBS
+if [[ -d /.build ]]; then
+ exit
+fi
if [[ ${PLATFORM} == "windows" ]]; then
wget --tries=3 --waitretry=30 --quiet -O tmp.zip "https://get.helm.sh/${HELM_DIST}.zip" && unzip -o -j tmp.zip "${PLATFORM}-${ARCH}/helm.exe" -d dist && rm -f tmp.zip
diff -ur portainer/build/download_kubectl_binary.sh portainer-2.25.1+git.0.60ca183/build/download_kubectl_binary.sh
--- portainer/build/download_kubectl_binary.sh 2025-02-20 14:18:29.049234635 +0100
+++ portainer-2.25.1+git.0.60ca183/build/download_kubectl_binary.sh 2025-02-20 14:36:28.605691405 +0100
@@ -9,6 +9,11 @@
PLATFORM=$1
ARCH=$2
KUBECTL_VERSION=$3
+
+# don't care about downloads in OBS
+if [[ -d /.build ]]; then
+ exit
+fi
if [[ ${PLATFORM} == "windows" ]]; then
wget --tries=3 --waitretry=30 --quiet -O "dist/kubectl.exe" "https://dl.k8s.io/${KUBECTL_VERSION}/bin/windows/amd64/kubectl.exe"
--- portainer/build/build_binary.sh 2025-02-20 14:18:29.048885122 +0100
+++ portainer-2.25.1+git.0.60ca183/build/build_binary.sh 2025-02-20 15:36:53.247972581 +0100
@@ -25,7 +25,7 @@
DOCKER_VERSION=$(jq -r '.docker' < "${BINARY_VERSION_FILE}")
HELM_VERSION=$(jq -r '.helm' < "${BINARY_VERSION_FILE}")
KUBECTL_VERSION=$(jq -r '.kubectl' < "${BINARY_VERSION_FILE}")
-COMPOSE_VERSION=$(go list -m -f '{{.Version}}' github.com/docker/compose/v2)
+COMPOSE_VERSION=${COMPOSE_VERSION:-$(go list -m -f '{{.Version}}' github.com/docker/compose/v2)}
# copy templates
cp -r "./mustache-templates" "./dist"