Auto-merging via docker-versions-create

Aligned with openj9 branch #521
2026-02-23 09:36:24 +00:00 · 2020-06-19 13:26:25 -05:00 · 2020-05-20 08:14:33 -05:00 · 2020-05-06 16:10:47 -05:00 · 2020-05-02 09:34:03 -05:00 · 2020-04-25 12:10:38 -05:00
2 changed files with 1 additions and 26 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,25 +0,0 @@
-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
+FROM adoptopenjdk/openjdk8-openj9:alpine-nightly

 LABEL maintainer "itzg"
Author	SHA1	Message	Date
Geoff Bourne	3439020ed6	Auto-merging via docker-versions-create	2020-06-19 13:26:25 -05:00
Geoff Bourne	503bd86ab6	Auto-merging via docker-versions-create	2020-05-20 08:14:33 -05:00
Geoff Bourne	6bd25c20c3	Aligned with openj9 branch #521	2020-05-06 16:10:47 -05:00
Geoff Bourne	480b7645ba	Auto-merging via docker-versions-create	2020-05-02 09:34:03 -05:00
Geoff Bourne	dd80e5ebd5	Auto-merging via docker-versions-create	2020-04-25 12:10:38 -05:00
Geoff Bourne	8164ac05c1	Auto-merging via docker-versions-create	2020-04-17 21:28:41 -05:00
Geoff Bourne	70c61aed5c	Auto-merging via docker-versions-create	2020-04-11 08:51:41 -05:00
Geoff Bourne	3bde06fcfc	Auto-merging via docker-versions-create	2020-04-10 11:08:47 -05:00
Geoff Bourne	f7eb33b41b	Auto-merging via docker-versions-create	2020-04-03 13:31:35 -05:00
Geoff Bourne	1f7eafef87	Auto-merging via docker-versions-create	2020-04-03 13:28:47 -05:00
Geoff Bourne	0670114602	Auto-merging via docker-versions-create	2020-04-02 17:47:36 -05:00
Geoff Bourne	4feec8000b	Auto-merging via docker-versions-create	2020-03-30 08:31:58 -05:00
Geoff Bourne	e6db79cbbb	Auto-merging via docker-versions-create	2020-03-26 20:54:07 -05:00
Geoff Bourne	9d97a227f6	Auto-merging via docker-versions-create	2020-02-01 08:52:57 -06:00
Geoff Bourne	5d3393d66b	Auto-merging via docker-versions-create	2020-01-17 08:29:08 -06:00
Geoff Bourne	99c1fc81f1	Auto-merging via docker-versions-create	2019-11-16 09:30:57 -06:00
Geoff Bourne	ee97808168	Auto-merging via docker-versions-create	2019-11-16 09:04:21 -06:00
Geoff Bourne	2673d1c921	Merge branch 'master' into openj9-nightly	2019-11-16 09:01:30 -06:00
Geoff Bourne	9b7d5b35e4	Base image on adoptopenjdk/openjdk8-openj9:alpine-nightly	2019-11-02 08:40:48 -05:00