From bc60d4471cdfd87d1faf8d9eafe0589ebbf2408e Mon Sep 17 00:00:00 2001
From: Dominik Meyer <dmeyer@federationhq.de>
Date: Tue, 5 Sep 2023 21:12:09 +0200
Subject: [PATCH] ADD: try different build approach

---
 .drone.yml | 60 +++++++++++++++++-------------------------------------
 1 file changed, 19 insertions(+), 41 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f72759c..2b8cb6c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,21 +18,18 @@ volumes:
     read_only: false 
 
 steps:
-  - name: prepare manifest
-    image: quay.io/buildah/stable
-    privileged: true
-    volumes:
-    - name: fedhq-ca-crt
-      path: /etc/ssl/certs2/
-    - name: cache
-      path: /var/lib/containers/storage
-    commands:
-      - scripts/setupEnvironment.sh
-      - buildah manifest rm latex|| true
-      - buildah manifest create latex
-
-
-
+  # - name: prepare manifest
+  #   image: quay.io/buildah/stable
+  #   privileged: true
+  #   volumes:
+  #   - name: fedhq-ca-crt
+  #     path: /etc/ssl/certs2/
+  #   - name: cache
+  #     path: /var/lib/containers/storage
+  #   commands:
+  #     - scripts/setupEnvironment.sh
+  #     - buildah manifest rm latex|| true
+  #     - buildah manifest create latex
 
 ---
 kind: pipeline
@@ -49,10 +46,6 @@ volumes:
     name: fedhq-ca-crt
     default_mode: 420     # same as 644 in octal, or u+w,a+r
     optional: false
-- name: cache
-  claim:
-    name: federationhq-drone-cache-pvc
-    read_only: false 
 
 steps:
   - name: build amd64
@@ -61,13 +54,10 @@ steps:
     volumes:
     - name: fedhq-ca-crt
       path: /etc/ssl/certs2/
-    - name: cache
-      path: /var/lib/containers/storage
     commands:
       - scripts/setupEnvironment.sh
-      - buildah bud --network host -t "registry.cloud.federationhq.de/latex:latest" --manifest latex --arch amd64 .
-depends_on:
-  - prepare-manifest 
+      - buildah bud --network host -t "registry.cloud.federationhq.de/latex:latest-amd64"  --arch amd64 .
+      - buildah push registry.cloud.federationhq.de/latex:latest-amd64
 
 ---
 kind: pipeline
@@ -84,10 +74,6 @@ volumes:
     name: fedhq-ca-crt
     default_mode: 420     # same as 644 in octal, or u+w,a+r
     optional: false
-- name: cache
-  claim:
-    name: federationhq-drone-cache-pvc
-    read_only: false 
 
 steps:
   - name: build arm64
@@ -96,14 +82,10 @@ steps:
     volumes:
     - name: fedhq-ca-crt
       path: /etc/ssl/certs2/
-    - name: cache
-      path: /var/lib/containers/storage
     commands:
       - scripts/setupEnvironment.sh
-      - buildah bud -t "registry.cloud.federationhq.de/latex:latest" --net=host --manifest latex --arch arm64 .
-depends_on:
-  - prepare-manifest 
-  - build-amd64
+      - buildah bud -t "registry.cloud.federationhq.de/latex:lates-arm64" --net=host --arch arm64 .
+      - buildah push registry.cloud.federationhq.de/latex:lates-arm64
 
 ---
 kind: pipeline
@@ -118,10 +100,6 @@ volumes:
     name: fedhq-ca-crt
     default_mode: 420     # same as 644 in octal, or u+w,a+r
     optional: false
-- name: cache
-  claim:
-    name: federationhq-drone-cache-pvc
-    read_only: false 
 
 steps:
   - name: push
@@ -130,11 +108,11 @@ steps:
     volumes:
     - name: fedhq-ca-crt
       path: /etc/ssl/certs2/
-    - name: cache
-      path: /var/lib/containers/storage
     commands:
       - scripts/setupEnvironment.sh
-      - buildah push --all  latex docker://registry.cloud.federationhq.de/latex:latest" 
+      - buildah manifest create registry.cloud.federationhq.de/latex:latest registry.cloud.federationhq.de/latex:lates-arm64 registry.cloud.federationhq.de/latex:lates-amd64
+      - buildah manifest push --all  latex docker://registry.cloud.federationhq.de/latex:latest" 
+      - buildah manifest rm registry.cloud.federationhq.de/latex:latest
 depends_on:
   - build-amd64
   - build-arm64
\ No newline at end of file