ci: add publish squashfs layers

Signed-off-by: Petu Eusebiu <[email protected]>

.github/workflows/ci.yaml

@@ -9,11 +9,11 @@ on:
 jobs:
   ci:
     runs-on: ubuntu-latest
-    services:
-      registry:
-        image: ghcr.io/project-zot/zot-linux-amd64:latest
-        ports:
-          - 5000:5000
+    # services:
+    #   registry:
+    #     image: ghcr.io/project-zot/zot-linux-amd64:latest
+    #     ports:
+    #       - 5000:5000
     name: Test stacker-build-push-action
     steps:
       - uses: actions/checkout@v2
@@ -98,3 +98,35 @@ jobs:
           url: docker://localhost:5000/five/app
           layer-type: 'tar squashfs'
           skip-tls: true
+
+      - name: Run stacker-build with push, tags, build-args and layer-type(squashfs)
+        uses: ./
+        with:
+          file: 'test/stacker.yaml'
+          build-args: |
+            SUB1=VAR1
+            SUB2=VAR2
+            SUB3=VAR3
+          tags: v1 latest
+          url: docker://localhost:5000/six/app
+          layer-type: 'squashfs'
+          skip-tls: true
+
+      - name: Check images were published
+        run: |
+          docker pull localhost:5000/one/app/test:v1
+          docker pull localhost:5000/one/app/test
+          docker pull localhost:5000/two/app/test:v1
+          docker pull localhost:5000/two/app/test
+          docker pull localhost:5000/three/app/test:v1
+          docker pull localhost:5000/three/app/test
+          docker pull localhost:5000/four/app/app:v1
+          docker pull localhost:5000/four/app/app
+          docker pull localhost:5000/five/app/layer3_1:v2
+          docker pull localhost:5000/five/app/layer3_1:v2
+
+          # check squashfs
+          curl http://localhost:5000/v2/six/app/test/manifests/v1-squashfs
+          curl http://localhost:5000/v2/six/app/test/manifests/latest-squashfs
+          curl http://localhost:5000/v2/five/app/layer3_2/manifests/v2-squashfs
+          curl http://localhost:5000/v2/five/app/layer3_1/manifests/v2-squashfs

action.yml

@@ -25,7 +25,7 @@ inputs:
   file-pattern:
     description: 'regex pattern to use when searching for stackerfile paths, used with dir arg'
     required: false
-    default: '\\/stacker.yaml$'
+    default: 'stacker.yaml'
   layer-type:
     description: 'Set the output layer type (supported values: tar, squashfs) separated by whitespace'
     required: false
@@ -41,7 +41,7 @@ inputs:
     description: 'Tags used when pushing to remote OCI registry, separated by whitespace'
     required: false
   url:
-    description: 'Remote registry URL, eg: docker://ghcr.io/myRepo'
+    description: 'Remote registry URL, eg: docker://ghcr.io/myrepo'
     required: false
   username:
     description: 'Username for the remote registry'

dist/index.js

@@ -12573,7 +12573,7 @@ class StackerCLI {
             finalExecOptions.env = execEnv;
             try {
                 const exitCode = yield exec.exec(this.executable, args, finalExecOptions);
-                if (execOptions.ignoreReturnCode !== true && exitCode !== 0) {
+                if (exitCode !== 0) {
                     let error = `${external_path_.basename(this.executable)} exited with code ${exitCode}`;
                     if (stderr) {
                         error += `\n${stderr}`;
@@ -12732,7 +12732,6 @@ function run() {
         const substitutes = getInputList("build-args");
         var subfile = core.getInput("build-args-file");
         const layerTypes = getSpaceSeparatedInput("layer-type");
-        core.info(`dockerfile val: ${dockerfile}`);
         if (dockerfile) {
             let [cmdRes, convertRes] = yield cli.convertDockerfile(dockerfile);
             if (convertRes && (yield cmdRes).exitCode == 0) {

src/index.ts

@@ -61,7 +61,6 @@ export async function run(): Promise<void> {
     // get layer-type from input
     const layerTypes = utils.getSpaceSeparatedInput("layer-type");
 
-    core.info(`dockerfile val: ${dockerfile}`);
     if (dockerfile) {
         let [cmdRes, convertRes] = await cli.convertDockerfile(dockerfile);
 

src/stacker.ts

@@ -202,7 +202,7 @@ export class StackerCLI {
         try {
             const exitCode = await exec.exec(this.executable, args, finalExecOptions);
 
-            if (execOptions.ignoreReturnCode !== true && exitCode !== 0) {
+            if (exitCode !== 0) {
                 // Throwing the stderr as part of the Error makes the stderr
                 // show up in the action outline, which saves some clicking when debugging.
                 let error = `${path.basename(this.executable)} exited with code ${exitCode}`;

test/builds/first/stacker.yaml

@@ -3,12 +3,12 @@ layer1_1:
         type: docker
         url: docker://centos:latest
     import:
-        - import1
+        - importfile1
     run: |
-        cp /stacker/imports/import1 /root/import1
+        cp /stacker/imports/importfile1 /root/importfile1
 layer1_2:
     from:
         type: docker
         url: docker://centos:latest
     run:
-        touch /root/import0
+        touch /root/importfile0

test/builds/second/stacker.yaml

@@ -1,12 +1,12 @@
 config:
     prerequisites:
-        - ../sub1/stacker.yaml
+        - ../first/stacker.yaml
 layer2:
     from:
         type: built
         tag: layer1_1
     import:
-        - import2
+        - importfile2
     run: |
-        cp /stacker/imports/import2 /root/import2
-        cp /root/import1 /root/import1_copied
+        cp /stacker/imports/importfile2 /root/importfile2
+        cp /root/importfile1 /root/importfile1_copied

test/builds/third/stacker.yaml

@@ -1,16 +1,16 @@
 config:
     prerequisites:
-        - ../sub1/stacker.yaml
-        - ../sub2/stacker.yaml
+        - ../first/stacker.yaml
+        - ../second/stacker.yaml
 layer3_1:
     from:
         type: built
         tag: layer2
     run: |
-        cp /root/import2 /root/import2_copied
+        cp /root/importfile2 /root/importfile2_copied
 layer3_2:
     from:
         type: built
         tag: layer1_2
     run: |
-        cp /root/import0 /root/import0_copied
+        cp /root/importfile0 /root/importfile0_copied