Auto-merging via docker-versions-create

# Conflicts: # .circleci/config.yml
2026-02-23 09:36:24 +00:00 · 2020-06-19 13:25:41 -05:00 · 2020-05-20 08:14:14 -05:00 · 2020-05-02 09:33:49 -05:00 · 2020-04-25 12:10:22 -05:00 · 2020-04-17 21:28:25 -05:00
2 changed files with 26 additions and 1 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -0,0 +1,25 @@
+version: 2
+jobs:
+  minecraft_server:
+    docker:
+      - image: circleci/buildpack-deps:stable
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: Build image
+          command: docker build -t itzg/minecraft-server:${CIRCLE_BRANCH} .
+#      - run:
+#          name: Build arm v7 image
+#          command: docker build -t itzg/minecraft-server:${CIRCLE_BRANCH}-arm-v7 --platform linux/arm/v7 --build-arg ARCH=armv7 .
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - minecraft_server:
+          filters:
+            branches:
+              ignore:
+                - armv7
+                - multiarch
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8-openj9:alpine-nightly
+FROM adoptopenjdk/openjdk8-openj9:alpine

 LABEL maintainer "itzg"
Author	SHA1	Message	Date
Geoff Bourne	7aaf106ffe	Auto-merging via docker-versions-create # Conflicts: # .circleci/config.yml	2020-06-19 13:25:41 -05:00
Geoff Bourne	5f77902441	Auto-merging via docker-versions-create	2020-05-20 08:14:14 -05:00
Geoff Bourne	c200efc9c9	Auto-merging via docker-versions-create	2020-05-02 09:33:49 -05:00
Geoff Bourne	e924126a56	Auto-merging via docker-versions-create	2020-04-25 12:10:22 -05:00
Geoff Bourne	bbd3d3cfc1	Auto-merging via docker-versions-create	2020-04-17 21:28:25 -05:00
Geoff Bourne	d77c19c69b	Auto-merging via docker-versions-create	2020-04-11 08:51:36 -05:00
Geoff Bourne	7ee77e4f47	Auto-merging via docker-versions-create	2020-04-10 11:08:41 -05:00
Geoff Bourne	84d0cff4c8	Auto-merging via docker-versions-create	2020-04-03 13:31:30 -05:00
Geoff Bourne	70519b9764	Auto-merging via docker-versions-create # Conflicts: # README.md # start-minecraftFinalSetup	2020-04-03 13:28:27 -05:00
Geoff Bourne	4683ea496d	Auto-merging via docker-versions-create	2020-04-02 17:47:30 -05:00
Geoff Bourne	0e3a82f9d3	Auto-merging via docker-versions-create	2020-03-30 08:31:53 -05:00
Geoff Bourne	d2554f2271	Auto-merging via docker-versions-create	2020-03-26 20:54:00 -05:00
Geoff Bourne	55e62371ac	Auto-merging via docker-versions-create	2020-02-01 08:52:51 -06:00
Geoff Bourne	c9a5fcfac8	Auto-merging via docker-versions-create	2020-01-17 08:29:05 -06:00
Geoff Bourne	a1f8154d05	Auto-merging via docker-versions-create	2019-11-16 09:30:54 -06:00
Geoff Bourne	e5d0a9362a	Auto-merging via docker-versions-create	2019-11-16 09:04:17 -06:00
Geoff Bourne	ca9c280b0b	Merge branch 'master' into openj9	2019-11-16 09:01:17 -06:00
Geoff Bourne	6ef4e984c7	ci: disable cross-building arm-v7 image	2019-08-13 20:06:57 -05:00
Geoff Bourne	ea4f78346a	ci: try cross-building arm-v7 image	2019-08-13 20:04:34 -05:00
Geoff Bourne	007f9426bf	Switch to OpenJ9 base image (#360 ) (cherry picked from commit `93197ffb77`)	2019-08-10 18:56:36 -05:00