-
-
Notifications
You must be signed in to change notification settings - Fork 806
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #515 from themepark-dev/develop
1.14
- Loading branch information
Showing
18 changed files
with
74 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,50 +94,3 @@ jobs: | |
| docker build docker-mods/$app --tag ghcr.io/${{ secrets.GHCR_USER }}/theme.park:$app${{ github.event.inputs.append-tag }} | ||
| docker push ghcr.io/${{ secrets.GHCR_USER }}/theme.park:$app${{ github.event.inputs.append-tag }} | ||
| done | ||
| push_to_dockerhub: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: checkout | ||
| uses: actions/[email protected] | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Login to Docker Hub | ||
| uses: docker/[email protected] | ||
| with: | ||
| username: ${{ secrets.DH_USER }} | ||
| password: ${{ secrets.DOCKERHUB_TOKEN }} | ||
| - name: Extract branch name | ||
| shell: bash | ||
| run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT | ||
| id: extract_branch | ||
| - name: build all on push | ||
| if: ${{ github.event_name == 'push' }} | ||
| run: | | ||
| branch=${{ steps.extract_branch.outputs.branch }} | ||
| if [ "$branch" = "master" ]; then | ||
| branch="" | ||
| else | ||
| branch="-$branch" | ||
| fi | ||
| for dir in docker-mods/*; | ||
| do | ||
| app="$( echo "$dir" | cut -d'/' -f2 -s )" | ||
| docker build docker-mods/$app --tag ${{ secrets.DH_USER }}/theme.park:$app$branch | ||
| docker push ${{ secrets.DH_USER }}/theme.park:$app$branch | ||
| done | ||
| - name: manually build | ||
| if: ${{ github.event.inputs.app && github.event.inputs.app != 'build-all-the-mods' }} | ||
| run: | | ||
| docker build docker-mods/${{ github.event.inputs.app }} --tag ${{ secrets.DH_USER }}/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} | ||
| docker push ${{ secrets.DH_USER }}/theme.park:${{ github.event.inputs.app }}${{ github.event.inputs.append-tag }} | ||
| - name: manually build all mods | ||
| if: ${{ github.event.inputs.app == 'build-all-the-mods' }} | ||
| run: | | ||
| for dir in docker-mods/*; | ||
| do | ||
| app="$( echo "$dir" | cut -d'/' -f2 -s )" | ||
| docker build docker-mods/$app --tag ${{ secrets.DH_USER }}/theme.park:$app${{ github.event.inputs.append-tag }} | ||
| docker push ${{ secrets.DH_USER }}/theme.park:$app${{ github.event.inputs.append-tag }} | ||
| done | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,22 +64,15 @@ jobs: | |
| username: ${{ github.repository_owner }} | ||
| password: ${{ secrets.GH_PAT }} | ||
|
|
||
| - name: Login to Docker Hub | ||
| uses: docker/[email protected] | ||
| with: | ||
| username: ${{ secrets.DH_USER }} | ||
| password: ${{ secrets.DOCKERHUB_TOKEN }} | ||
|
|
||
| - name: build&push | ||
| uses: docker/[email protected] | ||
| with: | ||
| push: ${{ github.event_name != 'pull_request' }} | ||
| platforms: ${{ env.platform }} | ||
| file: ./${{ matrix.architecture }}.Dockerfile | ||
| cache-from: docker.io/${{ env.cache }} | ||
| cache-to: docker.io/${{ env.cache }} | ||
| cache-from: ghcr.io/${{ env.cache }} | ||
| cache-to: ghcr.io/${{ env.cache }} | ||
| tags: | | ||
| docker.io/${{ env.tag }} | ||
| ghcr.io/${{ env.tag }} | ||
| labels: | | ||
| org.opencontainers.image.created=${{ env.created }} | ||
|
|
@@ -98,20 +91,12 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| registry: [docker.io, ghcr.io] | ||
| registry: [ghcr.io] | ||
| needs: [build-and-push-it-to-the-limit] | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/[email protected] | ||
|
|
||
| - name: Login to DockerHub | ||
| if: matrix.registry == 'docker.io' | ||
| uses: docker/[email protected] | ||
| with: | ||
| registry: docker.io | ||
| username: ${{ secrets.DH_USER }} | ||
| password: ${{ secrets.DOCKERHUB_TOKEN }} | ||
|
|
||
| - name: Login to GitHub Container Registry | ||
| if: matrix.registry == 'ghcr.io' | ||
| uses: docker/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.