From c650a1fae1b2c8f114af55aad03d3ffe34072c63 Mon Sep 17 00:00:00 2001
From: MassiveBox <box@massivebox.net>
Date: Sat, 22 Jul 2023 10:24:01 +0200
Subject: [PATCH] Fix multi-arch container build

---
 jenkins/Dockerfile  |  5 ++++-
 jenkins/Jenkinsfile | 34 +++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile
index 1cfaa85..96d5a1d 100644
--- a/jenkins/Dockerfile
+++ b/jenkins/Dockerfile
@@ -1,7 +1,10 @@
 FROM debian:latest
 
 WORKDIR /app
-COPY app app
+COPY ecodash_arm ecodash_arm
+COPY ecodash_x86 ecodash_x86
 COPY templates templates
 
+RUN if [ "$(uname -m)" = "aarch64" ]; then mv ecodash_arm app; rm ecodash_x86; else mv ecodash_x86 app; rm ecodash_arm fi
+
 CMD ["./app"]
diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
index e94582b..d97746e 100644
--- a/jenkins/Jenkinsfile
+++ b/jenkins/Jenkinsfile
@@ -17,25 +17,15 @@ pipeline {
                 sh 'curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin'
                 sh 'go mod tidy'
                 sh 'golangci-lint run'
-                sh 'env GOOS=linux GOARCH=amd64 go build -o app src/main/main.go'
-                stash includes: 'app', name: 'ecodash-x86'
-                sh 'env GOOS=linux GOARCH=arm go build -o app src/main/main.go'
-                stash includes: 'app', name: 'ecodash-arm'
+                sh 'env GOOS=linux GOARCH=amd64 go build -o ecodash_x86 src/main/main.go'
+                stash includes: 'ecodash_x86', name: 'ecodash_x86'
+                sh 'env GOOS=linux GOARCH=arm go build -o ecodash_arm src/main/main.go'
+                stash includes: 'ecodash_arm', name: 'ecodash_arm'
                 stash includes: 'jenkins/Dockerfile', name: 'dockerfile'
                 stash includes: 'templates/**', name: 'templates'
             }
         }
         
-        
-        stage('Build x86 container') {
-            steps {
-                unstash 'dockerfile'
-                unstash 'ecodash-x86'
-                unstash 'templates'
-                sh 'cp jenkins/Dockerfile ./Dockerfile; docker build -t ecodash .'
-            }
-        }
-        
         stage('Prepare buildx') {
             steps {
                 sh """
@@ -50,12 +40,22 @@ pipeline {
             }
         }
         
-        stage('Build arm container') {
+        stage('Build multi-arch container') {
             steps {
                 unstash 'dockerfile'
-                unstash 'ecodash-arm'
+                unstash 'ecodash_x86'
+                unstash 'ecodash_arm'
                 unstash 'templates'
-                sh 'cp jenkins/Dockerfile ./Dockerfile; docker buildx build --platform linux/arm64 -t ecodash .'
+                sh 'cp jenkins/Dockerfile ./Dockerfile; docker buildx build --platform linux/amd64,linux/arm64 -t ecodash .'
+            }
+        }
+        
+        stage('Publish built files') {
+            steps {
+                sh 'mv ecodash_x86 ecodash'
+                archiveArtifacts artifacts: ['templates/**', 'ecodash'] name: 'ecodash-x86'
+                sh 'mv ecodash_arm ecodash'
+                archiveArtifacts artifacts: ['templates/**', 'ecodash'] name: 'ecodash-arm'
             }
         }