From 0b67372e12bf22d7835663db673d2cf1ff0deb5d Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 10 Sep 2024 11:43:47 +0300 Subject: [PATCH 1/5] docker release test --- .github/workflows/release.yml | 79 +++++++++++++++++++++++++---------- 1 file changed, 57 insertions(+), 22 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 16f0abf1..d0dfbb98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,8 @@ name: Release UDX Worker on: push: - branches: - - latest + # branches: + # - latest jobs: test-pipeline: @@ -47,8 +47,43 @@ jobs: echo "$CHANGELOG" >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV - github-release: + # github-release: + # runs-on: ubuntu-latest + # needs: [test-pipeline] + # permissions: + # contents: write + # steps: + # - name: Checkout code + # uses: actions/checkout@v4 + # with: + # fetch-depth: 0 + + # - name: Configure git for pushing + # run: | + # git config --global user.email "worker@udx.io" + # git config --global user.name "UDX Worker" + + # - name: Create GitHub Tag + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # run: | + # git tag ${{ needs.test-pipeline.outputs.semVer }} + # git push origin ${{ needs.test-pipeline.outputs.semVer }} + + # - name: Create GitHub release + # uses: actions/create-release@v1 + # with: + # tag_name: ${{ needs.test-pipeline.outputs.semVer }} + # release_name: ${{ needs.test-pipeline.outputs.semVer }} + # body: ${{ needs.test-pipeline.outputs.changelog }} + # draft: false + # prerelease: false + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + docker-release: runs-on: ubuntu-latest + # needs: [test-pipeline, github-release] needs: [test-pipeline] permissions: contents: write @@ -58,25 +93,25 @@ jobs: with: fetch-depth: 0 - - name: Configure git for pushing - run: | - git config --global user.email "worker@udx.io" - git config --global user.name "UDX Worker" + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - - name: Create GitHub Tag - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - git tag ${{ needs.test-pipeline.outputs.semVer }} - git push origin ${{ needs.test-pipeline.outputs.semVer }} + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + password: ${{ secrets.DOCKER_TOKEN }} - - name: Create GitHub release - uses: actions/create-release@v1 + - name: Build and push Docker image + uses: docker/build-push-action@v2 with: - tag_name: ${{ needs.test-pipeline.outputs.semVer }} - release_name: ${{ needs.test-pipeline.outputs.semVer }} - body: ${{ needs.test-pipeline.outputs.changelog }} - draft: false - prerelease: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + context: . + file: ./Dockerfile + push: true + tags: | + udx-worker:${{ needs.test-pipeline.outputs.semVer }} + udx-worker:latest + build-args: | + GIT_VERSION=${{ needs.test-pipeline.outputs.semVer }} + + - name: Log out from Docker Hub + run: docker logout From e2d76ccd474a36dac3e9986a3341f7a64f9be6c9 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 10 Sep 2024 11:45:54 +0300 Subject: [PATCH 2/5] added username --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d0dfbb98..1c531df5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,6 +99,7 @@ jobs: - name: Log in to Docker Hub uses: docker/login-action@v2 with: + username: "fqjony" password: ${{ secrets.DOCKER_TOKEN }} - name: Build and push Docker image From 7d331b5ac70df15931b37f8295cc258c8bc9a964 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 10 Sep 2024 12:43:41 +0300 Subject: [PATCH 3/5] fixed docker hub ref --- .github/workflows/release.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1c531df5..6efb5a8b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,11 +20,11 @@ jobs: with: fetch-depth: 0 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + # - name: Set up Docker Buildx + # uses: docker/setup-buildx-action@v3 - - name: Run Development Pipeline - run: make dev-pipeline + # - name: Run Development Pipeline + # run: make dev-pipeline - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2 @@ -109,8 +109,8 @@ jobs: file: ./Dockerfile push: true tags: | - udx-worker:${{ needs.test-pipeline.outputs.semVer }} - udx-worker:latest + usabilitydynamics/udx-worker:${{ needs.test-pipeline.outputs.semVer }} + usabilitydynamics/udx-worker:latest build-args: | GIT_VERSION=${{ needs.test-pipeline.outputs.semVer }} From 807cc29a984ca9d839a33b3be11432c98929e7e5 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 10 Sep 2024 12:53:48 +0300 Subject: [PATCH 4/5] set vars.DOCKER_USERNAME for docker login --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6efb5a8b..c8c68622 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,7 +99,7 @@ jobs: - name: Log in to Docker Hub uses: docker/login-action@v2 with: - username: "fqjony" + username: ${{ vars.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - name: Build and push Docker image From acd0e3f7e307b0ac76eb81b86c88998f2798ed00 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Tue, 10 Sep 2024 12:54:33 +0300 Subject: [PATCH 5/5] cleanup before merge --- .github/workflows/release.yml | 81 +++++++++++++++++------------------ 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8c68622..8829a936 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,8 @@ name: Release UDX Worker on: push: - # branches: - # - latest + branches: + - latest jobs: test-pipeline: @@ -20,11 +20,11 @@ jobs: with: fetch-depth: 0 - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - # - name: Run Development Pipeline - # run: make dev-pipeline + - name: Run Development Pipeline + run: make dev-pipeline - name: Install GitVersion uses: gittools/actions/gitversion/setup@v2 @@ -47,44 +47,43 @@ jobs: echo "$CHANGELOG" >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV - # github-release: - # runs-on: ubuntu-latest - # needs: [test-pipeline] - # permissions: - # contents: write - # steps: - # - name: Checkout code - # uses: actions/checkout@v4 - # with: - # fetch-depth: 0 - - # - name: Configure git for pushing - # run: | - # git config --global user.email "worker@udx.io" - # git config --global user.name "UDX Worker" - - # - name: Create GitHub Tag - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # run: | - # git tag ${{ needs.test-pipeline.outputs.semVer }} - # git push origin ${{ needs.test-pipeline.outputs.semVer }} - - # - name: Create GitHub release - # uses: actions/create-release@v1 - # with: - # tag_name: ${{ needs.test-pipeline.outputs.semVer }} - # release_name: ${{ needs.test-pipeline.outputs.semVer }} - # body: ${{ needs.test-pipeline.outputs.changelog }} - # draft: false - # prerelease: false - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + github-release: + runs-on: ubuntu-latest + needs: [test-pipeline] + permissions: + contents: write + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure git for pushing + run: | + git config --global user.email "worker@udx.io" + git config --global user.name "UDX Worker" + + - name: Create GitHub Tag + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git tag ${{ needs.test-pipeline.outputs.semVer }} + git push origin ${{ needs.test-pipeline.outputs.semVer }} + + - name: Create GitHub release + uses: actions/create-release@v1 + with: + tag_name: ${{ needs.test-pipeline.outputs.semVer }} + release_name: ${{ needs.test-pipeline.outputs.semVer }} + body: ${{ needs.test-pipeline.outputs.changelog }} + draft: false + prerelease: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} docker-release: runs-on: ubuntu-latest - # needs: [test-pipeline, github-release] - needs: [test-pipeline] + needs: [test-pipeline, github-release] permissions: contents: write steps: