From 212736366a2eb55e28b32cda7ea217819c0f530d Mon Sep 17 00:00:00 2001
From: Yvan Janssens <yvanj@cyber.gent>
Date: Wed, 22 Mar 2023 13:34:10 +0000
Subject: [PATCH] Switch to buildx instead of kaniko, remove proxy

---
 .woodpecker.yml | 8 +++-----
 Dockerfile      | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 0d63fc6..161b871 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,13 +1,11 @@
 pipeline:
   publish-docker-image:
-    image: plugins/kaniko
-    environment:
-      - http_proxy=http://netsupport.lan.cyber.gent:3128
-      - https_proxy=http://netsupport.lan.cyber.gent:3128
+    image: woodpeckerci/plugin-docker-buildx
     settings:
+      dockerfile: Dockerfile
+      platforms: linux/amd64
       repo: git.cyber.gent/friedkiwi/code-server-mod
       tags: latest,v1-${CI_COMMIT_SHA:0:8}
-      dockerfile: Dockerfile
       username: ${CI_REPO_OWNER}
       registry: git.cyber.gent
       password:
diff --git a/Dockerfile b/Dockerfile
index 1fa8913..ffc6b9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/code-server:latest
 
 RUN apt update -y && apt upgrade -y && apt install -y build-essential cmake python3-dev c3270
 
-RUN git config --global http.proxy http://netsupport.lan.cyber.gent:3128
+#RUN git config --global http.proxy http://netsupport.lan.cyber.gent:3128
 
 RUN cd / && git clone https://github.com/wrljet/hercules-helper.git
 COPY allow-root-build.patch /hercules-helper
@@ -12,4 +12,4 @@ RUN cd /hercules-helper && patch hyperion-buildall.sh allow-root-build.patch &&
 COPY add-herc-helper-to-init.patch /hercules-helper
 RUN cd / && patch init /hercules-helper/add-herc-helper-to-init.patch
 
-RUN git config --global http.proxy 
+#RUN git config --global http.proxy