fix(ci): fix release images workflow

Store release binaries in different dirs closes project-zot#988 Signed-off-by: Petu Eusebiu <[email protected]>
eusebiu-constantin-petu-dbk · Nov 10, 2022 · ae9e4e0 · ae9e4e0
1 parent 94d073c
commit ae9e4e0
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 27 deletions.
diff --git a/stacker-conformance.yaml b/stacker-conformance.yaml
@@ -33,24 +33,26 @@ build:
 
     cat config.json
 
-    mkdir -p /zotcopy/build/binary
-    mkdir -p /zotcopy/build/cert
-    mkdir -p /zotcopy/build/config
-    cp /go/src/github.com/project-zot/zot/bin/zot-linux-amd64 /zotcopy/build/binary
-    cp /go/src/github.com/project-zot/zot/config.json /zotcopy/build/config
-    cp /etc/ssl/certs/ca-certificates.crt /zotcopy/build/cert
+    mkdir -p /zotcopy/build/${{OS}}-${{ARCH}}${{EXT:}}
+    cd /zotcopy/build/${{OS}}-${{ARCH}}${{EXT:}}
+
+    mkdir -p binary/ config/ cert/
+
+    cp /go/src/github.com/project-zot/zot/bin/zot-linux-amd64 binary/
+    cp /go/src/github.com/project-zot/zot/config.json config/
+    cp /etc/ssl/certs/ca-certificates.crt cert/
   build_only: true
 
 "${{REPO_NAME:zot}}":
   from:
     type: docker
     url: docker://gcr.io/distroless/base
   overlay_dirs:
-    - source: ./build/binary
+    - source: ./build/${{OS}}-${{ARCH}}/binary
       dest: /usr/local/bin
-    - source: ./build/cert
+    - source: ./build/${{OS}}-${{ARCH}}/cert
       dest: /etc/ssl/certs
-    - source: ./build/config
+    - source: ./build/${{OS}}-${{ARCH}}/config
       dest: /etc/zot
   entrypoint:
     - /usr/bin/zot-linux-amd64

diff --git a/stacker-zb.yaml b/stacker-zb.yaml
@@ -15,16 +15,19 @@ build:
     cd /go/src/github.com/project-zot/zot
     make COMMIT=${{COMMIT}} OS=${{OS}} ARCH=${{ARCH}} clean bench
 
-    mkdir -p /zotcopy/build/binary
-    cp /go/src/github.com/project-zot/zot/bin/zb-${{OS}}-${{ARCH}} /zotcopy/build/binary
+    mkdir -p /zotcopy/build/${{OS}}-${{ARCH}}${{EXT:}}
+    cd /zotcopy/build/${{OS}}-${{ARCH}}${{EXT:}}
+
+    mkdir -p binary/
+    cp /go/src/github.com/project-zot/zot/bin/zb-${{OS}}-${{ARCH}} binary/
   build_only: true
 
 "${{REPO_NAME:zb}}":
   from:
     type: docker
     url: docker://gcr.io/distroless/base
   overlay_dirs:
-    - source: ./build/binary
+    - source: ./build/${{OS}}-${{ARCH}}/binary
       dest: /usr/local/bin
   entrypoint:
     - /usr/local/bin/zb-${{OS}}-${{ARCH}}
diff --git a/stacker-zxp.yaml b/stacker-zxp.yaml
@@ -33,20 +33,23 @@ build:
 
     cat config.json
 
-    mkdir -p /zotcopy/build/binary
-    mkdir -p /zotcopy/build/config
-    cp /go/src/github.com/project-zot/zot/bin/zxp-${{OS}}-${{ARCH}} /zotcopy/build/binary
-    cp /go/src/github.com/project-zot/zot/config.json /zotcopy/build/config
+    mkdir -p /zotcopy/build/${{OS}}-${{ARCH}}
+    cd /zotcopy/build/${{OS}}-${{ARCH}}
+
+    mkdir -p binary/ config/
+
+    cp /go/src/github.com/project-zot/zot/bin/zxp-${{OS}}-${{ARCH}} binary/
+    cp /go/src/github.com/project-zot/zot/config.json config/
   build_only: true
 
 "${{REPO_NAME:zxp}}":
   from:
     type: docker
     url: docker://gcr.io/distroless/base
   overlay_dirs:
-    - source: ./build/binary
+    - source: ./build/${{OS}}-${{ARCH}}/binary
       dest: /usr/local/bin
-    - source: ./build/config
+    - source: ./build/${{OS}}-${{ARCH}}/config
       dest: /etc/zxp
   entrypoint:
     - /usr/local/bin/zxp-${{OS}}-${{ARCH}}

diff --git a/stacker.yaml b/stacker.yaml
@@ -30,24 +30,26 @@ build:
     EOF
 
     cat config.json
-    mkdir -p /zotcopy/build/binary
-    mkdir -p /zotcopy/build/cert
-    mkdir -p /zotcopy/build/config
-    cp /go/src/github.com/project-zot/zot/bin/zot-${{OS}}-${{ARCH}}${{EXT:}} /zotcopy/build/binary
-    cp /go/src/github.com/project-zot/zot/config.json /zotcopy/build/config
-    cp /etc/ssl/certs/ca-certificates.crt /zotcopy/build/cert
+    mkdir -p /zotcopy/build/${{OS}}-${{ARCH}}${{EXT:}}
+    cd /zotcopy/build/${{OS}}-${{ARCH}}${{EXT:}}
+
+    mkdir -p binary/ config/ cert/
+
+    cp /go/src/github.com/project-zot/zot/bin/zot-${{OS}}-${{ARCH}}${{EXT:}} binary/
+    cp /go/src/github.com/project-zot/zot/config.json config/
+    cp /etc/ssl/certs/ca-certificates.crt cert/
   build_only: true
 
 "${{REPO_NAME:zot}}":
   from:
     type: docker
     url: docker://gcr.io/distroless/base
   overlay_dirs:
-    - source: ./build/binary
+    - source: ./build/${{OS}}-${{ARCH}}${{EXT:}}/binary
       dest: /usr/local/bin
-    - source: ./build/cert
+    - source: ./build/${{OS}}-${{ARCH}}${{EXT:}}/cert
       dest: /etc/ssl/certs
-    - source: ./build/config
+    - source: ./build/${{OS}}-${{ARCH}}${{EXT:}}/config
       dest: /etc/zot
   entrypoint:
     - /usr/local/bin/zot-${{OS}}-${{ARCH}}${{EXT:}}