fix(ci): fix releasing zot minimal image

closes project-zot#988 Signed-off-by: Petu Eusebiu <[email protected]>
eusebiu-constantin-petu-dbk · Nov 10, 2022 · 8b7cba3 · 8b7cba3
1 parent 5eeba93
commit 8b7cba3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 27 deletions.
diff --git a/build/stacker-conformance.yaml b/build/stacker-conformance.yaml
@@ -33,12 +33,12 @@ 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/${{REPO_NAME}}/binary
+    mkdir -p /zotcopy/.build/${{REPO_NAME}}/cert
+    mkdir -p /zotcopy/.build/${{REPO_NAME}}/config
+    cp /go/src/github.com/project-zot/zot/bin/zot-linux-amd64 /zotcopy/.build/${{REPO_NAME}}/binary
+    cp /go/src/github.com/project-zot/zot/config.json /zotcopy/.build/${{REPO_NAME}}/config
+    cp /etc/ssl/certs/ca-certificates.crt /zotcopy/.build/${{REPO_NAME}}/cert
   build_only: true
 
 "${{REPO_NAME:zot}}":
@@ -48,11 +48,11 @@ build:
     type: docker
     url: docker://gcr.io/distroless/base:latest-${{ARCH}}
   overlay_dirs:
-    - source: ./build/binary
+    - source: ./.build/${{REPO_NAME}}/binary
       dest: /usr/local/bin
-    - source: ./build/cert
+    - source: ./.build/${{REPO_NAME}}/cert
       dest: /etc/ssl/certs
-    - source: ./build/config
+    - source: ./.build/${{REPO_NAME}}/config
       dest: /etc/zot
   entrypoint:
     - /usr/bin/zot-linux-amd64

diff --git a/build/stacker-zb.yaml b/build/stacker-zb.yaml
@@ -15,8 +15,8 @@ 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/${{REPO_NAME}}/binary
+    cp /go/src/github.com/project-zot/zot/bin/zb-${{OS}}-${{ARCH}} /zotcopy/.build/${{REPO_NAME}}/binary
   build_only: true
 
 "${{REPO_NAME:zb}}":
@@ -26,7 +26,7 @@ build:
     type: docker
     url: docker://gcr.io/distroless/base:latest-${{ARCH}}
   overlay_dirs:
-    - source: ./build/binary
+    - source: ./.build/${{REPO_NAME}}/binary
       dest: /usr/local/bin
   entrypoint:
     - /usr/local/bin/zb-${{OS}}-${{ARCH}}
diff --git a/build/stacker-zxp.yaml b/build/stacker-zxp.yaml
@@ -33,10 +33,10 @@ 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/${{REPO_NAME}}/binary
+    mkdir -p /zotcopy/.build/${{REPO_NAME}}/config
+    cp /go/src/github.com/project-zot/zot/bin/zxp-${{OS}}-${{ARCH}} /zotcopy/.build/${{REPO_NAME}}/binary
+    cp /go/src/github.com/project-zot/zot/config.json /zotcopy/.build/${{REPO_NAME}}/config
   build_only: true
 
 "${{REPO_NAME:zxp}}":
@@ -46,9 +46,9 @@ build:
     type: docker
     url: docker://gcr.io/distroless/base:latest-${{ARCH}}
   overlay_dirs:
-    - source: ./build/binary
+    - source: ./.build/${{REPO_NAME}}/binary
       dest: /usr/local/bin
-    - source: ./build/config
+    - source: ./.build/${{REPO_NAME}}/config
       dest: /etc/zxp
   entrypoint:
     - /usr/local/bin/zxp-${{OS}}-${{ARCH}}

diff --git a/build/stacker.yaml b/build/stacker.yaml
@@ -30,12 +30,14 @@ 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/${{REPO_NAME}}
+    cd /zotcopy/.build/${{REPO_NAME}}
+
+    mkdir -p binary/ cert/ config/
+
+    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}}":
@@ -45,11 +47,11 @@ build:
     type: docker
     url: docker://gcr.io/distroless/base:latest-${{ARCH}}
   overlay_dirs:
-    - source: ./build/binary
+    - source: ./.build/${{REPO_NAME}}/binary
       dest: /usr/local/bin
-    - source: ./build/cert
+    - source: ./.build/${{REPO_NAME}}/cert
       dest: /etc/ssl/certs
-    - source: ./build/config
+    - source: ./.build/${{REPO_NAME}}/config
       dest: /etc/zot
   entrypoint:
     - /usr/local/bin/zot-${{OS}}-${{ARCH}}${{EXT:}}