diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 93e00de9..e7b3739a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -128,7 +128,8 @@ jobs: uses: ./.github/workflows/docker-push.yml strategy: matrix: - image: ${{ fromJSON(env.build_targets) }} + #image: fromJSON($build_targets) + image: ${{ fromJSON(${build_targets}) }} with: architecture: amd64 image: ${{ matrix.image }} @@ -138,85 +139,85 @@ jobs: REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} needs: [amd64-base, amd64-base-with-services, amd64-lab, amd64-full-stack] - arm64-push-ghcr: - uses: ./.github/workflows/docker-push.yml - strategy: - matrix: - image: ${{ fromJSON(env.build_targets) }} - with: - architecture: arm64 - image: ${{ matrix.image }} - registry: ghcr.io - secrets: - REGISTRY_USERNAME: ${{ github.actor }} - REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} - needs: [arm64-base, arm64-base-with-services, arm64-lab, arm64-full-stack] - - merge-tags-ghcr: - uses: ./.github/workflows/docker-merge-tags.yml - strategy: - matrix: - image: ${{ fromJSON(env.build_targets) }} - with: - image: ${{ matrix.image }} - registry: ghcr.io - secrets: - REGISTRY_USERNAME: ${{ github.actor }} - REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} - needs: [amd64-push-ghcr, arm64-push-ghcr] - - amd64-push-dockerhub: - if: github.repository == 'aiidalab/aiidalab-docker-stack' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) - uses: ./.github/workflows/docker-push.yml - strategy: - matrix: - image: ${{ fromJSON(env.build_targets) }} - with: - architecture: amd64 - image: ${{ matrix.image }} - registry: docker.io - secrets: - REGISTRY_USERNAME: ${{ secrets.DOCKER_USERNAME }} - REGISTRY_TOKEN: ${{ secrets.DOCKER_PASSWORD }} - needs: [amd64-base, amd64-base-with-services, amd64-lab, amd64-full-stack] - - arm64-push-dockerhub: - if: github.repository == 'aiidalab/aiidalab-docker-stack' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) - uses: ./.github/workflows/docker-push.yml - strategy: - matrix: - image: ${{ fromJSON(env.build_targets) }} - with: - architecture: arm64 - image: ${{ matrix.image }} - registry: docker.io - secrets: - REGISTRY_USERNAME: ${{ secrets.DOCKER_USERNAME }} - REGISTRY_TOKEN: ${{ secrets.DOCKER_PASSWORD }} - needs: [arm64-base, arm64-base-with-services, arm64-lab, arm64-full-stack] - - merge-tags-dockerhub: - if: github.repository == 'aiidalab/aiidalab-docker-stack' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) - uses: ./.github/workflows/docker-merge-tags.yml - strategy: - matrix: - image: ${{ fromJSON(env.build_targets) }} - with: - image: ${{ matrix.image }} - registry: docker.io - secrets: - REGISTRY_USERNAME: ${{ secrets.DOCKER_USERNAME }} - REGISTRY_TOKEN: ${{ secrets.DOCKER_PASSWORD }} - needs: [amd64-push-dockerhub, arm64-push-dockerhub] - - release: - runs-on: ubuntu-latest - needs: [merge-tags-ghcr, merge-tags-dockerhub] - steps: - - uses: actions/checkout@v3 - - - name: Create release - uses: softprops/action-gh-release@v1 - with: - generate_release_notes: true - if: github.repository == 'aiidalab/aiidalab-docker-stack' && startsWith(github.ref, 'refs/tags/v') + #arm64-push-ghcr: + # uses: ./.github/workflows/docker-push.yml + # strategy: + # matrix: + # image: ${{ fromJSON(env.build_targets) }} + # with: + # architecture: arm64 + # image: ${{ matrix.image }} + # registry: ghcr.io + # secrets: + # REGISTRY_USERNAME: ${{ github.actor }} + # REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # needs: [arm64-base, arm64-base-with-services, arm64-lab, arm64-full-stack] + + #merge-tags-ghcr: + # uses: ./.github/workflows/docker-merge-tags.yml + # strategy: + # matrix: + # image: ${{ fromJSON(env.build_targets) }} + # with: + # image: ${{ matrix.image }} + # registry: ghcr.io + # secrets: + # REGISTRY_USERNAME: ${{ github.actor }} + # REGISTRY_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # needs: [amd64-push-ghcr, arm64-push-ghcr] + + #amd64-push-dockerhub: + # if: github.repository == 'aiidalab/aiidalab-docker-stack' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) + # uses: ./.github/workflows/docker-push.yml + # strategy: + # matrix: + # image: ${{ fromJSON(env.build_targets) }} + # with: + # architecture: amd64 + # image: ${{ matrix.image }} + # registry: docker.io + # secrets: + # REGISTRY_USERNAME: ${{ secrets.DOCKER_USERNAME }} + # REGISTRY_TOKEN: ${{ secrets.DOCKER_PASSWORD }} + # needs: [amd64-base, amd64-base-with-services, amd64-lab, amd64-full-stack] + + #arm64-push-dockerhub: + # if: github.repository == 'aiidalab/aiidalab-docker-stack' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) + # uses: ./.github/workflows/docker-push.yml + # strategy: + # matrix: + # image: ${{ fromJSON(env.build_targets) }} + # with: + # architecture: arm64 + # image: ${{ matrix.image }} + # registry: docker.io + # secrets: + # REGISTRY_USERNAME: ${{ secrets.DOCKER_USERNAME }} + # REGISTRY_TOKEN: ${{ secrets.DOCKER_PASSWORD }} + # needs: [arm64-base, arm64-base-with-services, arm64-lab, arm64-full-stack] + + #merge-tags-dockerhub: + # if: github.repository == 'aiidalab/aiidalab-docker-stack' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) + # uses: ./.github/workflows/docker-merge-tags.yml + # strategy: + # matrix: + # image: ${{ fromJSON(env.build_targets) }} + # with: + # image: ${{ matrix.image }} + # registry: docker.io + # secrets: + # REGISTRY_USERNAME: ${{ secrets.DOCKER_USERNAME }} + # REGISTRY_TOKEN: ${{ secrets.DOCKER_PASSWORD }} + # needs: [amd64-push-dockerhub, arm64-push-dockerhub] + + #release: + # runs-on: ubuntu-latest + # needs: [merge-tags-ghcr, merge-tags-dockerhub] + # steps: + # - uses: actions/checkout@v3 + + # - name: Create release + # uses: softprops/action-gh-release@v1 + # with: + # generate_release_notes: true + # if: github.repository == 'aiidalab/aiidalab-docker-stack' && startsWith(github.ref, 'refs/tags/v')