diff --git a/.github/workflows/push-web-only.yml b/.github/workflows/push-web-only.yml index 873a21b13..a8a117f7d 100644 --- a/.github/workflows/push-web-only.yml +++ b/.github/workflows/push-web-only.yml @@ -13,7 +13,7 @@ jobs: version: runs-on: ubuntu-latest outputs: - tests-passed: ${{ steps.latest.outputs.version }} + latest: ${{ steps.latest.outputs.version }} stable: ${{ steps.stable.outputs.version }} steps: - uses: ruby/setup-ruby@v1 @@ -23,9 +23,9 @@ jobs: uses: actions/checkout@v4 with: repository: discourse/discourse - ref: tests-passed + ref: latest fetch-depth: 1 - path: 'tests-passed' + path: 'latest' - name: checkout stable uses: actions/checkout@v4 with: @@ -34,7 +34,7 @@ jobs: fetch-depth: 1 path: 'stable' - id: latest - working-directory: tests-passed + working-directory: latest run: | version=$(ruby -r ./lib/version.rb -e "puts ::Discourse::VERSION::STRING") echo "version=$version" @@ -49,14 +49,14 @@ jobs: push: strategy: matrix: - version: [tests-passed,stable] + version: [latest,stable] os: [ubuntu-latest, ubuntu-24.04-arm] runs-on: ${{ matrix.os }} needs: version env: ARCH: ${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }} - FLOATING_TAG: ${{ matrix.version == 'tests-passed' && 'latest' || matrix.version }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }} - TAG: ${{ matrix.version == 'stable' && needs.version.outputs.stable || needs.version.outputs.tests-passed }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }} + FLOATING_TAG: ${{ matrix.version == 'latest' && 'latest' || matrix.version }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }} + TAG: ${{ matrix.version == 'stable' && needs.version.outputs.stable || needs.version.outputs.latest }}-${{ matrix.os == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }} steps: - uses: actions/checkout@v4 with: @@ -110,10 +110,10 @@ jobs: docker manifest push ${{ env.DOCKER_REPO }}:stable docker manifest create \ - ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }} \ - --amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }}-amd64 \ - --amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }}-arm64 - docker manifest push ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.tests-passed }} + ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }} \ + --amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }}-amd64 \ + --amend ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }}-arm64 + docker manifest push ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.latest }} docker manifest create \ ${{ env.DOCKER_REPO }}:${{ needs.version.outputs.stable }} \ diff --git a/samples/standalone.yml b/samples/standalone.yml index 99f9060b7..10286935f 100644 --- a/samples/standalone.yml +++ b/samples/standalone.yml @@ -33,8 +33,8 @@ params: ## can improve sorting performance, but adds memory usage per-connection #db_work_mem: "40MB" - ## Which Git revision should this container use? (default: tests-passed) - #version: tests-passed + ## Which Git revision should this container use? (default: latest) + #version: latest env: LC_ALL: en_US.UTF-8 diff --git a/samples/web_only.yml b/samples/web_only.yml index d335c847e..c7a0491cd 100644 --- a/samples/web_only.yml +++ b/samples/web_only.yml @@ -25,8 +25,8 @@ links: # docker_args: params: - ## Which Git revision should this container use? (default: tests-passed) - #version: tests-passed + ## Which Git revision should this container use? (default: latest) + #version: latest env: LC_ALL: en_US.UTF-8 diff --git a/templates/web.template.yml b/templates/web.template.yml index 9cccefa48..ca16a0dc0 100644 --- a/templates/web.template.yml +++ b/templates/web.template.yml @@ -14,7 +14,7 @@ env: DISCOURSE_DB_PORT: params: - version: tests-passed + version: latest home: /var/www/discourse upload_size: 10m nginx_worker_connections: 4000