From 55df7d740d46c5d73a588f873991450213887689 Mon Sep 17 00:00:00 2001
From: The_Spider <nhyatt@smoothnet.org>
Date: Fri, 18 Mar 2022 10:12:57 -0500
Subject: [PATCH] changes build image for non-compatable libraries

---
 Jenkinsfile | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e0e04ff..d3d4ca0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,9 +17,14 @@ podTemplate(
                 command: "/bin/sh"
             ],
             [
-                name: "golang",
+                name: "golang-alpine",
                 path: "${repository}/dockerhub/library/golang:alpine",
                 command: "/bin/sh"
+            ],
+            [
+                name: "golang-ubuntu",
+                path: "${repository}/dockerhub/library/golang:latest",
+                command: "/bin/sh"
             ]
         ]
     )
@@ -38,7 +43,7 @@ podTemplate(
         }
 
         stage('Run Tests') {
-            container('golang') {
+            container('golang-alpine') {
                 writeFile(file: workspace + "/test-chamber-13.lan.root.crt", text: functions.getLocalRootCA())
                 sh """
                     if [ ! "/usr/bin/curl" ] || [ ! -x "/usr/bin/curl" ]; then
@@ -87,17 +92,20 @@ sonar.go.coverage.reportPaths=cover.out
         }
 
         stage("Build go-temper") {
-            container("golang") {
+            container("golang-ubuntu") {
                 sh """
+                    apt update
+                    apt install --yes --no-install-recommends libusb-1.0-0-dev gcc g++
                     if [ ! "/usr/bin/git" ] || [ ! -x "/usr/bin/git" ]; then
-                        apk add --no-cache git
+                        apt install --yes --no-install-recommends git
                     fi
                     if [ ! "/usr/bin/upx" ] || [ ! -x "/usr/bin/upx" ]; then
-                        apk add --no-cache upx
+                        apt install --yes --no-install-recommends upx
                     fi
-                    apk add --no-cache libusb-dev gcc g++ musl-dev pkgconfig
+                    ln -s "${workspace}" "/go/src/${env.JOB_BASE_NAME}"
+                    cd "/go/src/${env.JOB_BASE_NAME}"
                     go install -v ./...
-                    GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -v -ldflags="-s -w" -tags timetzdata -o go-temper ./cmd/go-temper
+                    GOOS=linux GOARCH=amd64 go build -v -ldflags="-s -w" -tags timetzdata -o go-temper ./cmd/go-temper
                     upx --lzma go-temper
                 """
             }