Merge pull request #4 from curl/fix-linux-arm64

fix CI

.github/workflows/build_ci_multi.yml

@@ -0,0 +1,35 @@
+name: build_ci_multi_images
+on:
+  pull_request:
+    types: [ opened, synchronize, reopened, labeled, unlabeled ]
+    branches:
+      - main
+env:
+  REGISTRY_USER: ${{ github.actor }}
+  REGISTRY_PASSWORD: ${{ github.token }}
+  IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
+
+jobs:
+  build_multi_ci:
+    name: ${{ matrix.build.name }}
+    runs-on: 'ubuntu-latest'
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        install_latest: [ true ]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - run: |
+          sudo apt-get update
+          sudo apt-get -y install buildah less git make podman qemu
+        name: 'install dev deps'
+      - run: buildah unshare make branch_or_ref=master release_tag=master multibuild
+        name: 'build multi image'
+      - run: buildah unshare make dist_name=localhost/curl-multi release_tag=master test
+        name: 'test image'
+#      - run: make dist_name=curl-multi release_tag=$REL scan
+#        name: 'security scan image'

.github/workflows/build_latest_release_multi.yml

@@ -1,8 +1,8 @@
 name: build_latest_release_multi_images
 on:
   push:
-    branches:
-    - main
+    tags:
+      - '*'
 env:
   REGISTRY_USER: ${{ github.actor }}
   REGISTRY_PASSWORD: ${{ github.token }}
@@ -23,7 +23,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
-          ref: "new_world"
+          tag_name: ${{ github.ref }}
       - name: Log in to ghcr.io
         uses: redhat-actions/podman-login@v1
         with:

.github/workflows/build_master.yml

@@ -6,10 +6,6 @@ on:
   push:
     branches:
     - main
-    - '*/ci'
-  pull_request:
-    branches:
-    - main
 
 env:
   REGISTRY_USER: ${{ github.actor }}
@@ -31,7 +27,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
-          ref: "new_world"
+          ref: "main"
       - name: Log in to ghcr.io
         uses: redhat-actions/podman-login@v1
         with:

.github/workflows/build_master_multi.yml

@@ -6,10 +6,6 @@ on:
   push:
     branches:
     - main
-    - '*/ci'
-  pull_request:
-    branches:
-    - main
 
 env:
   REGISTRY_USER: ${{ github.actor }}
@@ -31,7 +27,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
-          ref: "new_world"
+          ref: "main"
       - name: Log in to ghcr.io
         uses: redhat-actions/podman-login@v1
         with:

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+- enhanced CI jobs
+
 ## [8.1.2] - 2023-06-06
 ### Added
 - created [curl-container repo](https://github.com/curl/curl-container/pull/1)

create_base_image.sh

@@ -89,6 +89,7 @@ buildah config --env CURL_CA_BUNDLE="/cacert.pem" $ctr
 # setup curl_group and curl_user though it is not used
 buildah run $ctr addgroup -S curl_group
 buildah run $ctr adduser -S curl_user -G curl_group
+unable to find user curl_user: no matching entries in passwd file
 
 # set entrypoint
 buildah config --cmd curl $ctr

tests/test_image.sh

@@ -20,7 +20,7 @@ dist=${1}
 branch_or_tag=${2}
 
 # create and mount image
-ctr=$(buildah from curl:${branch_or_tag})
+ctr=$(buildah from ${dist}:${branch_or_tag})
 ctrmnt=$(buildah mount $ctr)
 
 # check file exists