Auto-merging via docker-versions-create

# Conflicts:
#	.circleci/config.yml
This commit is contained in:
Geoff Bourne committed 2020-04-11 08:56:29 -05:00
commit f6df4d6694
3 files changed
+40 -5

No files matched your search

+7 -3
View File
@@ -1,7 +1,7 @@
version: 2.1
jobs:
build:
minecraft_server:
docker:
- image: docker:18.09.6
environment:
@@ -16,5 +16,9 @@ workflows:
version: 2
build:
jobs:
- build
- minecraft_server:
filters:
branches:
ignore:
- armv7
- multiarch