diff --git a/.github/workflows/image-push-master.yml b/.github/workflows/image-push-master.yml index b2b88ab9e..a091cb9ee 100644 --- a/.github/workflows/image-push-master.yml +++ b/.github/workflows/image-push-master.yml @@ -3,9 +3,6 @@ on: push: branches: - master -env: - REPOSITORY: docker.io/nfvpe/multus - REPOSITORY_USER: nfvperobot jobs: push-amd64: name: Image push/amd64 @@ -17,22 +14,23 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:latest-amd64 - ${{ env.REPOSITORY }}:snapshot-amd64 + ghcr.io/${{ github.repository }}:latest-amd64 + ghcr.io/${{ github.repository }}:snapshot-amd64 file: deployments/Dockerfile push-arm64: @@ -45,22 +43,23 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:latest-arm64 - ${{ env.REPOSITORY }}:snapshot-arm64 + ghcr.io/${{ github.repository }}:latest-arm64 + ghcr.io/${{ github.repository }}:snapshot-arm64 file: deployments/Dockerfile.arm64 push-ppc64le: @@ -73,22 +72,23 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:latest-ppc64le - ${{ env.REPOSITORY }}:snapshot-ppc64le + ghcr.io/${{ github.repository }}:latest-ppc64le + ghcr.io/${{ github.repository }}:snapshot-ppc64le file: deployments/Dockerfile.ppc64le push-s390x: @@ -101,22 +101,23 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:latest-s390x - ${{ env.REPOSITORY }}:snapshot-s390x + ghcr.io/${{ github.repository }}:latest-s390x + ghcr.io/${{ github.repository }}:snapshot-s390x file: deployments/Dockerfile.s390x push-origin: @@ -129,40 +130,44 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:latest-origin - ${{ env.REPOSITORY }}:snapshot-origin + ghcr.io/${{ github.repository }}:latest-origin + ghcr.io/${{ github.repository }}:snapshot-origin file: deployments/Dockerfile.openshift push-manifest: needs: [push-amd64, push-arm64, push-ppc64le, push-s390x] runs-on: ubuntu-latest + env: + REPOSITORY: ghcr.io/${{ github.repository }} steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Create manifest for multi-arch images - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' run: | # get artifacts from previous steps docker pull ${{ env.REPOSITORY }}:snapshot-amd64 diff --git a/.github/workflows/image-push-release.yml b/.github/workflows/image-push-release.yml index c7465d01a..162c39ff1 100644 --- a/.github/workflows/image-push-release.yml +++ b/.github/workflows/image-push-release.yml @@ -3,9 +3,6 @@ on: push: tags: - v* -env: - REPOSITORY: docker.io/nfvpe/multus - REPOSITORY_USER: nfvperobot jobs: push-amd64: name: Image push/amd64 @@ -17,28 +14,29 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 with: - images: ${{ env.REPOSITORY }} + images: ghcr.io/${{ github.repository }} tag-latest: false - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:stable-amd64 + ghcr.io/${{ github.repository }}:stable-amd64 ${{ steps.docker_meta.outputs.tags }}-amd64 file: deployments/Dockerfile @@ -52,28 +50,29 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 with: - images: ${{ env.REPOSITORY }} + images: ghcr.io/${{ github.repository }} tag-latest: false - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:stable-arm64 + ghcr.io/${{ github.repository }}:stable-arm64 ${{ steps.docker_meta.outputs.tags }}-arm64 file: deployments/Dockerfile.arm64 @@ -87,28 +86,29 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 with: - images: ${{ env.REPOSITORY }} + images: ghcr.io/${{ github.repository }} tag-latest: false - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:stable-ppc64le + ghcr.io/${{ github.repository }}:stable-ppc64le ${{ steps.docker_meta.outputs.tags }}-ppc64le file: deployments/Dockerfile.ppc64le @@ -122,28 +122,29 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 with: - images: ${{ env.REPOSITORY }} + images: ghcr.io/${{ github.repository }} tag-latest: false - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:stable-s390x + ghcr.io/${{ github.repository }}:stable-s390x ${{ steps.docker_meta.outputs.tags }}-s390x file: deployments/Dockerfile.s390x @@ -157,34 +158,37 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 with: - images: ${{ env.REPOSITORY }} + images: ghcr.io/${{ github.repository }} tag-latest: false - name: Push container image - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/build-push-action@v2 with: context: . push: true tags: | - ${{ env.REPOSITORY }}:stable-origin + ghcr.io/${{ github.repository }}:stable-origin ${{ steps.docker_meta.outputs.tags }}-origin file: deployments/Dockerfile.openshift push-manifest: needs: [push-amd64, push-arm64, push-ppc64le, push-s390x] runs-on: ubuntu-latest + env: + REPOSITORY: ghcr.io/${{ github.repository }} steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -193,18 +197,19 @@ jobs: id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 with: - images: ${{ env.REPOSITORY }} + images: ghcr.io/${{ github.repository }} tag-latest: false - - name: Login to Container Registry - if: github.repository_owner == 'intel' + - name: Login to GitHub Container Registry + if: github.repository_owner == 'k8snetworkplumbingwg' uses: docker/login-action@v1 with: - username: ${{ env.REPOSITORY_USER }} - password: ${{ secrets.REPOSITORY_PASS }} + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Create manifest for multi-arch images - if: github.repository_owner == 'intel' + if: github.repository_owner == 'k8snetworkplumbingwg' run: | # get artifacts from previous steps docker pull ${{ steps.docker_meta.outputs.tags }}-amd64 diff --git a/deployments/Dockerfile b/deployments/Dockerfile index 4593c6287..5abb80101 100644 --- a/deployments/Dockerfile +++ b/deployments/Dockerfile @@ -13,6 +13,7 @@ RUN rpm --import https://mirror.go-repo.io/centos/RPM-GPG-KEY-GO-REPO && \ ./hack/build-go.sh FROM centos:centos7 +LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni COPY --from=build /usr/src/multus-cni /usr/src/multus-cni WORKDIR / diff --git a/deployments/Dockerfile.arm64 b/deployments/Dockerfile.arm64 index de13da74b..cbb8bef9b 100644 --- a/deployments/Dockerfile.arm64 +++ b/deployments/Dockerfile.arm64 @@ -12,6 +12,7 @@ RUN cd /usr/src/multus-cni && \ # build arm64 container FROM arm64v8/centos:7 +LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni COPY --from=build /usr/src/multus-cni /usr/src/multus-cni WORKDIR / diff --git a/deployments/Dockerfile.openshift b/deployments/Dockerfile.openshift index 215d5a569..f3ebe21b5 100644 --- a/deployments/Dockerfile.openshift +++ b/deployments/Dockerfile.openshift @@ -8,6 +8,7 @@ ENV GO111MODULE=off RUN ./hack/build-go.sh FROM openshift/origin-base +LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni RUN mkdir -p /usr/src/multus-cni/images && mkdir -p /usr/src/multus-cni/bin COPY --from=builder /usr/src/multus-cni/bin/multus /usr/src/multus-cni/bin ADD ./images/entrypoint.sh / diff --git a/deployments/Dockerfile.ppc64le b/deployments/Dockerfile.ppc64le index 7e26f1f2e..627dca036 100644 --- a/deployments/Dockerfile.ppc64le +++ b/deployments/Dockerfile.ppc64le @@ -17,6 +17,7 @@ RUN rpm --import https://mirror.go-repo.io/centos/RPM-GPG-KEY-GO-REPO && \ # build ppc container FROM ppc64le/centos:latest +LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni COPY --from=build /usr/src/multus-cni /usr/src/multus-cni WORKDIR / diff --git a/deployments/Dockerfile.s390x b/deployments/Dockerfile.s390x index af59c3b14..d3fdc15eb 100644 --- a/deployments/Dockerfile.s390x +++ b/deployments/Dockerfile.s390x @@ -12,6 +12,7 @@ RUN cd /usr/src/multus-cni && \ # build s390x container FROM s390x/python:3-slim +LABEL org.opencontainers.image.source https://github.com/k8snetworkplumbingwg/multus-cni COPY --from=build /usr/src/multus-cni /usr/src/multus-cni WORKDIR / ADD ./images/entrypoint.sh /