diff --git a/.github/workflows/build-drivers.yaml b/.github/workflows/build-drivers.yaml index a538496e4b..589e9d7585 100644 --- a/.github/workflows/build-drivers.yaml +++ b/.github/workflows/build-drivers.yaml @@ -37,7 +37,7 @@ jobs: steps: - name: Checkout Sysdig - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download DriverKit run: | diff --git a/.github/workflows/release-draft.yaml b/.github/workflows/release-draft.yaml index 77dac26690..263e2a18c7 100644 --- a/.github/workflows/release-draft.yaml +++ b/.github/workflows/release-draft.yaml @@ -180,8 +180,9 @@ jobs: with: file: docker/sysdig/Dockerfile context: . - tags: ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.BUILD_VERSION }}-draft + tags: ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.BUILD_VERSION }}-${{ matrix.platform }}-draft push: true + provenance: false build-args: BUILD_VERSION=${{ env.BUILD_VERSION }} diff --git a/.github/workflows/release-final.yaml b/.github/workflows/release-final.yaml index 36a4d22fab..28f179f34b 100644 --- a/.github/workflows/release-final.yaml +++ b/.github/workflows/release-final.yaml @@ -31,15 +31,48 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Publish final docker images + - name: Publish final docker images (amd64) uses: akhilerm/tag-push-action@v2.0.0 with: - src: ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }}-draft + src: ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }}-amd64-draft dst: | - ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }} - ${{ env.SYSDIG_IMAGE_BASE }}:latest - ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:${{ env.RELEASE }} - ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:latest + ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }}-amd64 + ${{ env.SYSDIG_IMAGE_BASE }}:latest-amd64 + ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:${{ env.RELEASE }}-amd64 + ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:latest-amd64 + + - name: Publish final docker images (aarch64) + uses: akhilerm/tag-push-action@v2.0.0 + with: + src: ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }}-aarch64-draft + dst: | + ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }}-aarch64 + ${{ env.SYSDIG_IMAGE_BASE }}:latest-aarch64 + ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:${{ env.RELEASE }}-aarch64 + ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:latest-aarch64 + + - name: Create latest manifest and push + run: | + docker manifest create \ + ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }} \ + --amend ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }}-amd64 \ + --amend ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }}-aarch64 + docker manifest push ${{ env.SYSDIG_IMAGE_BASE }}:${{ env.RELEASE }} + docker manifest create \ + ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:${{ env.RELEASE }} \ + --amend ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:${{ env.RELEASE }}-amd64 \ + --amend ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:${{ env.RELEASE }}-aarch64 + docker manifest push ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:${{ env.RELEASE }} + docker manifest create \ + ${{ env.SYSDIG_IMAGE_BASE }}:latest \ + --amend ${{ env.SYSDIG_IMAGE_BASE }}:latest-amd64 \ + --amend ${{ env.SYSDIG_IMAGE_BASE }}:latest-aarch64 + docker manifest push ${{ env.SYSDIG_IMAGE_BASE }}:latest + docker manifest create \ + ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:latest \ + --amend ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:latest-amd64 \ + --amend ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:latest-aarch64 + docker manifest push ${{ env.SYSDIG_DOCKERHUB_IMAGE_BASE }}:latest release-rpm: strategy: @@ -83,7 +116,7 @@ jobs: ./aws/install - name: Checkout Sysdig - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: sysdig @@ -149,7 +182,7 @@ jobs: sudo apt-get update && sudo apt-get -y install dpkg-dev gpg - name: Checkout Sysdig - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: sysdig @@ -210,7 +243,7 @@ jobs: steps: - name: Checkout Sysdig - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: sysdig diff --git a/docker/sysdig/Dockerfile b/docker/sysdig/Dockerfile index f11e6fc31b..091e25e1ad 100644 --- a/docker/sysdig/Dockerfile +++ b/docker/sysdig/Dockerfile @@ -2,11 +2,11 @@ FROM registry.access.redhat.com/ubi8/ubi LABEL usage="docker run --rm -i -t --privileged --net=host -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /src:/src -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc:ro --name NAME IMAGE" -ARG BUILD_VERSION 0.1.1dev -ENV BUILD_VERSION ${BUILD_VERSION} +ARG BUILD_VERSION=0.1.1dev +ENV BUILD_VERSION=${BUILD_VERSION} -ENV HOST_ROOT /host -ENV HOME /root +ENV HOST_ROOT=/host +ENV HOME=/root RUN yum -y install \ make \