amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-04-20 20:39:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into java16-openj9

Browse Source 
# Conflicts:
#	.github/workflows/build-multiarch.yml
#	Dockerfile
This commit is contained in:
Geoff Bourne
2021-05-21 16:46:51 -05:00
parent 581b514970 cb17180dea
commit 7229c40202
7 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-multiarch.yml vendored
View File

@@ -2,16 +2,18 @@ name: Build and publish multiarch
on:
push:
branches:
- master
- multiarch
- multiarch-latest
- java15
- java16
- java16*
- test/multiarch/*
tags:
- "[0-9]+.[0-9]+.[0-9]+"
- "[0-9]+.[0-9]+.[0-9]+-multiarch"
- "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
- "[0-9]+.[0-9]+.[0-9]+-java15"
- "[0-9]+.[0-9]+.[0-9]+-java16"
- "[0-9]+.[0-9]+.[0-9]+-java16*"
paths-ignore:
- "*.md"
- "docs/**"
@@ -33,6 +35,7 @@ jobs:
tags: |
type=ref,event=branch
type=ref,event=tag
type=edge,branch=master
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v1