From 0f432a1ee3f1082abdbdc069a79e45d4988df2bc Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Thu, 8 Jan 2026 20:57:02 +0100 Subject: [PATCH] fixes registry used for mattermost-build-server image push and pull (#34882) * fixes registry used for mattermost-build-server image push and pull * fixes credentials needed for logging in to mattermosr registry --- .github/workflows/build-server-image.yml | 24 +++++++++++----------- .github/workflows/mmctl-test-template.yml | 2 +- .github/workflows/server-ci.yml | 20 +++++++++--------- .github/workflows/server-test-template.yml | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build-server-image.yml b/.github/workflows/build-server-image.yml index dad4a5b3015..b0ca2bcdd2c 100644 --- a/.github/workflows/build-server-image.yml +++ b/.github/workflows/build-server-image.yml @@ -33,8 +33,8 @@ jobs: - name: buildenv/docker-login uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: - username: ${{ secrets.DOCKERHUB_DEV_USERNAME }} - password: ${{ secrets.DOCKERHUB_DEV_TOKEN }} + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: buildenv/build uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0 @@ -44,16 +44,16 @@ jobs: load: true push: false pull: false - tags: mattermostdevelopment/mattermost-build-server:test + tags: mattermost/mattermost-build-server:test - name: buildenv/test run: | - docker run --rm mattermostdevelopment/mattermost-build-server:test /bin/sh -c "go version && node --version" + docker run --rm mattermost/mattermost-build-server:test /bin/sh -c "go version && node --version" - name: buildenv/calculate-golang-version id: go run: | - GO_VERSION=$(docker run --rm mattermostdevelopment/mattermost-build-server:test go version | awk '{print $3}' | sed 's/go//') + GO_VERSION=$(docker run --rm mattermost/mattermost-build-server:test go version | awk '{print $3}' | sed 's/go//') echo "GO_VERSION=${GO_VERSION}" >> "${GITHUB_OUTPUT}" - name: buildenv/push @@ -65,7 +65,7 @@ jobs: load: false push: true pull: true - tags: mattermostdevelopment/mattermost-build-server:${{ steps.go.outputs.GO_VERSION }} + tags: mattermost/mattermost-build-server:${{ steps.go.outputs.GO_VERSION }} build-image-fips: runs-on: ubuntu-22.04 @@ -79,8 +79,8 @@ jobs: - name: buildenv/docker-login uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0 with: - username: ${{ secrets.DOCKERHUB_DEV_USERNAME }} - password: ${{ secrets.DOCKERHUB_DEV_TOKEN }} + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} - name: buildenv/build uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0 @@ -90,16 +90,16 @@ jobs: load: true push: false pull: false - tags: mattermostdevelopment/mattermost-build-server-fips:test + tags: mattermost/mattermost-build-server-fips:test - name: buildenv/test run: | - docker run --rm --entrypoint bash mattermostdevelopment/mattermost-build-server-fips:test -c "go version && node --version" + docker run --rm --entrypoint bash mattermost/mattermost-build-server-fips:test -c "go version && node --version" - name: buildenv/calculate-golang-version id: go run: | - GO_VERSION=$(docker run --rm --entrypoint bash mattermostdevelopment/mattermost-build-server-fips:test -c "go version" | awk '{print $3}' | sed 's/go//') + GO_VERSION=$(docker run --rm --entrypoint bash mattermost/mattermost-build-server-fips:test -c "go version" | awk '{print $3}' | sed 's/go//') echo "GO_VERSION=${GO_VERSION}" >> "${GITHUB_OUTPUT}" - name: buildenv/push @@ -111,4 +111,4 @@ jobs: load: false push: true pull: true - tags: mattermostdevelopment/mattermost-build-server-fips:${{ steps.go.outputs.GO_VERSION }} + tags: mattermost/mattermost-build-server-fips:${{ steps.go.outputs.GO_VERSION }} diff --git a/.github/workflows/mmctl-test-template.yml b/.github/workflows/mmctl-test-template.yml index cf2ebb8d54d..18b3bb96d96 100644 --- a/.github/workflows/mmctl-test-template.yml +++ b/.github/workflows/mmctl-test-template.yml @@ -46,7 +46,7 @@ jobs: echo "BUILD_IMAGE=mattermost/mattermost-build-server-fips:${{ inputs.go-version }}" >> "${GITHUB_OUTPUT}" echo "LOG_ARTIFACT_NAME=${{ inputs.logsartifact }}-fips" >> "${GITHUB_OUTPUT}" else - echo "BUILD_IMAGE=mattermostdevelopment/mattermost-build-server:${{ inputs.go-version }}" >> "${GITHUB_OUTPUT}" + echo "BUILD_IMAGE=mattermost/mattermost-build-server:${{ inputs.go-version }}" >> "${GITHUB_OUTPUT}" echo "LOG_ARTIFACT_NAME=${{ inputs.logsartifact }}" >> "${GITHUB_OUTPUT}" fi diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml index 6e9669e8224..46b4f6e86af 100644 --- a/.github/workflows/server-ci.yml +++ b/.github/workflows/server-ci.yml @@ -40,7 +40,7 @@ jobs: name: Check mocks needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -57,7 +57,7 @@ jobs: name: Check go mod tidy needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -74,7 +74,7 @@ jobs: name: check-style needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -91,7 +91,7 @@ jobs: name: Check serialization methods for hot structs needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -108,7 +108,7 @@ jobs: name: Vet API needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -123,7 +123,7 @@ jobs: name: Check migration files needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -138,7 +138,7 @@ jobs: name: Generate email templates needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -155,7 +155,7 @@ jobs: name: Check store layers needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -172,7 +172,7 @@ jobs: name: Check mmctl docs needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server @@ -271,7 +271,7 @@ jobs: name: Build mattermost server app needs: go runs-on: ubuntu-22.04 - container: mattermostdevelopment/mattermost-build-server:${{ needs.go.outputs.version }} + container: mattermost/mattermost-build-server:${{ needs.go.outputs.version }} defaults: run: working-directory: server diff --git a/.github/workflows/server-test-template.yml b/.github/workflows/server-test-template.yml index 838957adf86..9ab55c3e187 100644 --- a/.github/workflows/server-test-template.yml +++ b/.github/workflows/server-test-template.yml @@ -59,7 +59,7 @@ jobs: echo "BUILD_IMAGE=mattermost/mattermost-build-server-fips:${{ inputs.go-version }}" >> "${GITHUB_OUTPUT}" echo "LOG_ARTIFACT_NAME=${{ inputs.logsartifact }}-fips" >> "${GITHUB_OUTPUT}" else - echo "BUILD_IMAGE=mattermostdevelopment/mattermost-build-server:${{ inputs.go-version }}" >> "${GITHUB_OUTPUT}" + echo "BUILD_IMAGE=mattermost/mattermost-build-server:${{ inputs.go-version }}" >> "${GITHUB_OUTPUT}" echo "LOG_ARTIFACT_NAME=${{ inputs.logsartifact }}" >> "${GITHUB_OUTPUT}" fi