Add renovate.json

.woodpecker.yaml

@@ -13,22 +13,25 @@ matrix:
 steps:
   build-${TARGET}:
     name: Build ${TARGET}
-    image: git.badhouseplants.net/badhouseplants/badhouseplants-builder:latest
+    image: gitea.badhouseplants.net/badhouseplants/badhouseplants-builder:latest
     secrets:
       - gitea_token
+    environment:
+      CONTAINER_REGISTRY: gitea.badhouseplants.net
     privileged: true
     depends_on: []
     backend_options:
       kubernetes:
         resources:
           requests:
-            memory: 500Mi
-            cpu: 200m
+            memory: 1024Mi
+            cpu: 300m
           limits:
-            memory: 500Mi
-            cpu: 200m
+            memory: 1024Mi
         securityContext:
           privileged: true
+        nodeSelector:
+          kubernetes.io/arch: "amd64"
     commands:
       - source ./env/${TARGET}.env
       - ./scripts/$SCRIPT

containerfiles/Containerfile

@@ -16,7 +16,7 @@ RUN dudo -l "https://swupdate.openvpn.org/community/releases/openvpn-{{ version
 RUN tar -xf /tmp/openvpn.tar.gz  -C /tmp && rm -f /tmp/openvpn.tar.gz
 RUN mv /tmp/openvpn-${OPENVPN_VERSION} /output/openvpn
 
-FROM ubuntu as builder
+FROM ubuntu:22.04 as builder
 # ------------------------------------------------------
 # -- TODO: Define it only once
 # ------------------------------------------------------
@@ -36,7 +36,7 @@ RUN cp $(which openvpn) /output/
 # ------------------------------------------------------
 # -- Final container
 # ------------------------------------------------------
-FROM ubuntu:24.04
+FROM ubuntu:22.04
 LABEL maintainer="allanger <allanger@zohomail.com>"
 COPY --from=builder /output /src
 # -------------------------------------------------------

containerfiles/Containerfile-XOR

@@ -23,7 +23,7 @@ RUN dudo -l "https://github.com/Tunnelblick/Tunnelblick/archive/refs/tags/v{{ ve
 RUN tar -xf /tmp/tunnelblick.tar.gz  -C /tmp && rm -f /tmp/tunnelblick.tar.gz
 RUN mv /tmp/Tunnelblick-$TUNNELBLICK_VERSION /output/tunnelblick
 
-FROM ubuntu as builder
+FROM ubuntu:24.04 as builder
 # ------------------------------------------------------
 # -- TODO: Define it only once
 # ------------------------------------------------------

env/openvpn.env

@@ -1,3 +1,3 @@
-export OPENVPN_VERSION=2.6.11
+export OPENVPN_VERSION=2.6.5
 export CONTAINERFILE=./containerfiles/Containerfile
 export SCRIPT=build_upstream.sh

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

scripts/build_xor.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env sh
 git clone https://github.com/Tunnelblick/Tunnelblick.git /tmp/tunnelblick
+git -C /tmp/tunnelblick checkout $TUNNELBLICK_VERSION
 export OPENVPN_VERSION=$(ls /tmp/tunnelblick/third_party/sources/openvpn | sed 's/openvpn-//g' | sort  -k1,1nr -k2,2n -k3,3n | head -n 1)
 export CUSTOM_TAG="v$OPENVPN_VERSION-XOR-$TUNNELBLICK_VERSION"
 export BUILD_ARGS="--build-arg OPENVPN_VERSION=$OPENVPN_VERSION --build-arg TUNNELBLICK_VERSION=$TUNNELBLICK_VERSION"