Merge from master

Auto-merging via docker-versions-create
2026-02-17 15:13:55 +00:00 · 2021-05-22 13:46:46 -05:00 · 2021-05-21 23:03:19 -05:00 · 2021-05-21 22:52:21 -05:00 · 2021-05-21 17:36:21 -05:00 · 2021-05-21 17:32:38 -05:00
3 changed files with 4 additions and 4 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -27,7 +27,7 @@ jobs:
  docker-buildx:
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: master
+      CACHE_NAME: java15
    steps:
      - name: Checkout
        uses: actions/checkout@v2.3.4
@@ -43,7 +43,7 @@ jobs:
            type=ref,event=tag
            type=edge,branch=master
          flavor: |
-            latest=auto
+            latest=false
      - name: Setup Docker Buildx
        uses: docker/setup-buildx-action@v1
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
      - test
    runs-on: ubuntu-20.04
    env:
-      CACHE_NAME: master
+      CACHE_NAME: java15
    steps:
    - uses: actions/checkout@v2.3.4
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jre
+FROM adoptopenjdk:15-jre
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
Author	SHA1	Message	Date
Geoff Bourne	68ccc1c36d	Merge from master	2021-05-22 13:46:46 -05:00
Geoff Bourne	3aa3e77c27	Auto-merging via docker-versions-create	2021-05-21 23:03:19 -05:00
Geoff Bourne	5d162d6c19	Auto-merging via docker-versions-create	2021-05-21 22:52:21 -05:00
Geoff Bourne	cf6829001e	ci: introduced CACHE_NAME	2021-05-21 17:36:21 -05:00
Geoff Bourne	af77b29509	ci: add java11 to build/merge	2021-05-21 17:32:38 -05:00
Geoff Bourne	521099b733	Auto-merging via docker-versions-create	2021-05-19 20:30:03 -05:00
Geoff Bourne	f297654bb6	Auto-merging via docker-versions-create	2021-05-15 12:43:07 -05:00
Geoff Bourne	01bd8f5860	Merge branch 'multiarch' into java15 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:01:56 -05:00
`@@ -1,4 +1,4 @@`
	`FROM adoptopenjdk:16-jre`	`FROM adoptopenjdk:15-jre`

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