Auto-merging via docker-versions-create

Merge branch 'master' into java11
2026-02-17 15:13:55 +00:00 · 2021-06-05 17:52:23 -05:00 · 2021-05-24 20:51:26 -05:00 · 2021-05-23 12:27:03 -05:00 · 2021-05-22 13:45:56 -05:00 · 2021-05-21 23:02:26 -05:00
2 changed files with 3 additions and 3 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -25,7 +25,7 @@ jobs:
  docker-buildx:
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: master
+      CACHE_NAME: java11
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
@@ -41,7 +41,7 @@ jobs:
            type=ref,event=tag
            type=edge,branch=master
          flavor: |
-            latest=true
+            latest=false
      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v1
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jre
+FROM adoptopenjdk:11-jre
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	dc8c9e5d1a	Auto-merging via docker-versions-create	2021-06-05 17:52:23 -05:00
Geoff Bourne	9577c84d6a	Auto-merging via docker-versions-create	2021-05-24 20:51:26 -05:00
Geoff Bourne	575197a109	Merge branch 'master' into java11	2021-05-23 12:27:03 -05:00
Geoff Bourne	2b621b8236	Merge from master	2021-05-22 13:45:56 -05:00
Geoff Bourne	14d3446f52	Auto-merging via docker-versions-create	2021-05-21 23:02:26 -05:00
Geoff Bourne	83a7481027	Auto-merging via docker-versions-create	2021-05-21 22:50:35 -05:00
Geoff Bourne	4c3a329e31	ci: adjusted CACHE_NAME	2021-05-21 17:34:05 -05:00
Geoff Bourne	6c94e49732	ci: updated java11 Dockerfile	2021-05-21 17:33:26 -05:00
Geoff Bourne	af77b29509	ci: add java11 to build/merge	2021-05-21 17:32:38 -05:00
`@@ -1,4 +1,4 @@`
	`FROM adoptopenjdk:16-jre`	`FROM adoptopenjdk:11-jre`

	`LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"`	`LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"`