From e0b744671bf50a3c40683ed1deb8d0b48e10805c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Mar 2026 06:53:54 +0000 Subject: [PATCH 1/2] Bump sigstore/cosign-installer from 4.0.0 to 4.1.1 Bumps [sigstore/cosign-installer](https://github.com/sigstore/cosign-installer) from 4.0.0 to 4.1.1. - [Release notes](https://github.com/sigstore/cosign-installer/releases) - [Commits](https://github.com/sigstore/cosign-installer/compare/faadad0cce49287aee09b3a48701e75088a2c6ad...cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003) --- updated-dependencies: - dependency-name: sigstore/cosign-installer dependency-version: 4.1.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/image-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image-publish.yml b/.github/workflows/image-publish.yml index a5bc168673..43c9ef68c8 100644 --- a/.github/workflows/image-publish.yml +++ b/.github/workflows/image-publish.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Install Cosign - uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0 + uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 # v4.1.1 with: cosign-release: 'v2.6.1' - name: Job information From 32f4e344b6ad00eabe25d042bdbc8c9dc2fa17d7 Mon Sep 17 00:00:00 2001 From: Maximilien Cuony Date: Thu, 26 Mar 2026 11:30:30 +0100 Subject: [PATCH 2/2] Test sign --- .github/workflows/ci.yml | 2 +- .github/workflows/image-publish.yml | 17 ++++++++--------- build/build_and_push.sh | 25 +++++++++++++++---------- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69ed5c3fc1..95e11bb097 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: Continuous integration on: - pull_request: # All + # pull_request: # All push: branches: - main diff --git a/.github/workflows/image-publish.yml b/.github/workflows/image-publish.yml index 43c9ef68c8..574c7ca1df 100644 --- a/.github/workflows/image-publish.yml +++ b/.github/workflows/image-publish.yml @@ -6,6 +6,7 @@ name: Publish monitoring image to Docker Registry (on new release tag) on: + pull_request: # All push: tags: # To modify to trigger the job for fork's releases @@ -21,15 +22,13 @@ jobs: name: Build and Push to Docker Hub runs-on: ubuntu-latest # To modify to enable the job for forked repository - if: github.repository == 'interuss/monitoring' + # if: github.repository == 'interuss/monitoring' permissions: id-token: write # needed for signing the images with GitHub OIDC Token steps: - name: Install Cosign uses: sigstore/cosign-installer@cad07c2e89fa2edd6e2d7bab4c1aa38e53f76003 # v4.1.1 - with: - cosign-release: 'v2.6.1' - name: Job information run: | echo "Job information" @@ -46,12 +45,12 @@ jobs: submodules: true fetch-depth: 0 - - name: Log in to Docker Hub - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 - with: - registry: docker.io - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + # - name: Log in to Docker Hub + # uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 + # with: + # registry: docker.io + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_PASSWORD }} - name: Build, push and sign image env: diff --git a/build/build_and_push.sh b/build/build_and_push.sh index 97dff81bd0..ba40c4c0fb 100755 --- a/build/build_and_push.sh +++ b/build/build_and_push.sh @@ -30,6 +30,11 @@ cd "${BASEDIR}" VERSION=$(./scripts/git/version.sh monitoring) LATEST_TAG="latest" + +docker run -d -p 5000:5000 --name registry registry:2 + +DOCKER_URL="localhost:5000" + if [[ -z "${DOCKER_URL}" ]]; then echo "DOCKER_URL environment variable is not set; building image to interuss/monitoring..." ./monitoring/build.sh @@ -41,7 +46,7 @@ else echo "Building image ${TAG}" ./monitoring/build.sh "${TAG}" - echo "Pushing docker image ${TAG}..." + # echo "Pushing docker image ${TAG}..." docker image push "${TAG}" echo "Built and pushed docker image ${TAG}" @@ -59,13 +64,13 @@ else fi - if [[ "${DOCKER_UPDATE_LATEST}" == "true" ]]; then - echo "Tagging docker image ${DOCKER_URL}/monitoring:${LATEST_TAG}..." - docker tag "${TAG}" "${DOCKER_URL}/monitoring:${LATEST_TAG}" - - echo "Pushing docker image ${DOCKER_URL}/monitoring:${LATEST_TAG}..." - docker image push "${DOCKER_URL}/monitoring:${LATEST_TAG}" - - echo "Built and pushed docker image ${DOCKER_URL}/monitoring:${LATEST_TAG}" - fi + # if [[ "${DOCKER_UPDATE_LATEST}" == "true" ]]; then + # echo "Tagging docker image ${DOCKER_URL}/monitoring:${LATEST_TAG}..." + # docker tag "${TAG}" "${DOCKER_URL}/monitoring:${LATEST_TAG}" + # + # echo "Pushing docker image ${DOCKER_URL}/monitoring:${LATEST_TAG}..." + # docker image push "${DOCKER_URL}/monitoring:${LATEST_TAG}" + # + # echo "Built and pushed docker image ${DOCKER_URL}/monitoring:${LATEST_TAG}" + # fi fi