From e6b83dee85062c8dbb5eb99720cdb98e5b465c69 Mon Sep 17 00:00:00 2001 From: PhilWun Date: Fri, 24 Mar 2023 11:03:57 +0100 Subject: [PATCH] GitHub registry (#314) * replace docker hub with GitHub registry * fix yml syntax * disable PlanQK service integration test * fix condition, temporarily disable integration tests * fix empty list * temporarily remove test job * reenable integration tests * replace every mention of Dockerhub --- .github/workflows/dockerhub.yml | 41 ---------------------- .github/workflows/dockerhub_stable.yml | 34 ------------------ .github/workflows/image.yml | 48 ++++++++++++++++++++++++++ .github/workflows/image_stable.yml | 42 ++++++++++++++++++++++ .github/workflows/maven.yml | 4 +-- 5 files changed, 92 insertions(+), 77 deletions(-) delete mode 100644 .github/workflows/dockerhub.yml delete mode 100644 .github/workflows/dockerhub_stable.yml create mode 100644 .github/workflows/image.yml create mode 100644 .github/workflows/image_stable.yml diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml deleted file mode 100644 index e89905edf..000000000 --- a/.github/workflows/dockerhub.yml +++ /dev/null @@ -1,41 +0,0 @@ -# This workflow will build the Container and push a corresponding Docker image to Dockerhub -name: Push docker image to Dockerhub - -on: - workflow_run: - workflows: - - Java CI with Maven - branches: [master] - types: - - completed - tags: - - "v*.*.*" - -jobs: - multi: - if: ${{ github.event.workflow_run.conclusion == 'success' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set output - id: vars - run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - - name: Build and push latest Container - if: ${{ steps.vars.outputs.tag == 'master' }} - uses: docker/build-push-action@v2 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: opentosca/container:latest diff --git a/.github/workflows/dockerhub_stable.yml b/.github/workflows/dockerhub_stable.yml deleted file mode 100644 index 1db9d3163..000000000 --- a/.github/workflows/dockerhub_stable.yml +++ /dev/null @@ -1,34 +0,0 @@ -# This workflow will build the Container and push a corresponding Docker image to Dockerhub -name: Push stable docker image to Dockerhub - -on: - push: - tags: - - "v*.*.*" - -jobs: - multi: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set branch name output - id: vars - run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_ACCESS_TOKEN }} - - - name: Build and push version of Container - uses: docker/build-push-action@v2 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: opentosca/container:${{ steps.vars.outputs.tag }} diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml new file mode 100644 index 000000000..246499087 --- /dev/null +++ b/.github/workflows/image.yml @@ -0,0 +1,48 @@ +# This workflow will build the Container and push a corresponding Docker image to the GitHub registry +name: Push docker image to the GitHub registry + +on: + workflow_run: + workflows: + - Java CI with Maven + branches: [master] + types: + - completed + tags: + - "v*.*.*" + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + multi: + if: ${{ github.event.workflow_run.conclusion == 'success' }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to GitHub registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and push + if: ${{ github.ref == 'refs/heads/master' }} + uses: docker/build-push-action@v4 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/image_stable.yml b/.github/workflows/image_stable.yml new file mode 100644 index 000000000..8bf3e1e73 --- /dev/null +++ b/.github/workflows/image_stable.yml @@ -0,0 +1,42 @@ +# This workflow will build the Container and push a corresponding Docker image to the GitHub registry +name: Push stable docker image to the GitHub registry + +on: + push: + tags: + - "v*.*.*" + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + multi: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to GitHub registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v4 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fc7e4cf2c..cfcff6618 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -35,7 +35,7 @@ jobs: tests: strategy: matrix: - test: + test: - AdaptMultiMyTinyToDoIntegrationTest - ApacheWebAppIntegrationTest - ConnectToIntegrationTest @@ -44,7 +44,7 @@ jobs: - MyTinyToDoBPMNIntegrationTest - MyTinyToDoIntegrationTest #- MyTinyToDoSqlIntegrationTest - - PlanQKServiceIntegrationTest + #- PlanQKServiceIntegrationTest - QHAnaTest runs-on: ubuntu-latest timeout-minutes: 80