Compare commits

..

9 Commits

Author SHA1 Message Date
Geoff Bourne
fc2ed9e612 Auto-merging via docker-versions-create 2021-06-20 12:48:15 -05:00
Geoff Bourne
edfe58079a Auto-merging via docker-versions-create 2021-06-05 17:51:25 -05:00
Geoff Bourne
d423cc3b8d Auto-merging via docker-versions-create 2021-05-24 20:50:52 -05:00
Geoff Bourne
1537e48e29 Merge branch 'master' into java8-openj9 2021-05-23 12:26:56 -05:00
Geoff Bourne
62473771dc Merge from master 2021-05-22 13:00:01 -05:00
Geoff Bourne
c4528e8f79 Auto-merging via docker-versions-create 2021-05-21 23:02:00 -05:00
Geoff Bourne
0f797487ab Auto-merging via docker-versions-create 2021-05-21 22:48:32 -05:00
Geoff Bourne
9511e3cc80 Merge branch 'master' into java8-openj9 2021-05-21 22:35:00 -05:00
Geoff Bourne
3aa4dd6c85 ci: added java8-openj9 branch 2021-05-21 22:31:40 -05:00
3 changed files with 4 additions and 4 deletions

View File

@@ -25,7 +25,7 @@ jobs:
docker-buildx:
runs-on: ubuntu-20.04
env:
CACHE_NAME: java8-multiarch
CACHE_NAME: java8-openj9
steps:
- name: Checkout
uses: actions/checkout@v2.3.4
@@ -69,7 +69,7 @@ jobs:
uses: docker/build-push-action@v2.5.0
with:
context: .
platforms: linux/amd64,linux/arm/v7,linux/arm64
platforms: linux/amd64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
# ensure latest base image is used

View File

@@ -30,7 +30,7 @@ jobs:
- test
runs-on: ubuntu-20.04
env:
CACHE_NAME: java8-multiarch
CACHE_NAME: java8-openj9
steps:
- uses: actions/checkout@v2.3.4

View File

@@ -1,4 +1,4 @@
FROM adoptopenjdk:8-jre-hotspot
FROM adoptopenjdk:8-jre-openj9
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"