From 498ecbc03260d82b13bb1360f34ec586c51fcd16 Mon Sep 17 00:00:00 2001 From: Shane St Savage Date: Sat, 4 Mar 2023 10:45:04 -0800 Subject: [PATCH] Build multiple Docker hub images for older Docker compatibility We should build (at least) two Docker hub images, one based on unidata/tomcat-docker:10.1.0-jdk17-openjdk and another based on unidata/tomcat-docker:10.1.0-jdk17-temurin-focal which is compatible with older Docker versions. https://github.com/docker-library/tomcat/issues/269 --- .github/workflows/push.yml | 4 ++++ Dockerfile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 42c0514..678f13b 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -23,6 +23,8 @@ jobs: include: - tag: "jdk17-openjdk" base: "unidata/tomcat-docker:10.1.0-jdk17-openjdk@sha256:8b595bcd8eee410e2d610829b5d4e312d51e3ea6c6bde952a5838845f67a4839" + - tag: "jdk17-temurin-focal" + base: "unidata/tomcat-docker:10.1.0-jdk17-temurin-focal@sha256:99c083fd17d1f8d6c85a0f771039ffb4d2430ff7fd6dabea8eb50f2731328af8" steps: - name: Checkout @@ -89,6 +91,8 @@ jobs: include: - tag: "jdk17-openjdk" base: "unidata/tomcat-docker:10.1.0-jdk17-openjdk@sha256:8b595bcd8eee410e2d610829b5d4e312d51e3ea6c6bde952a5838845f67a4839" + - tag: "jdk17-temurin-focal" + base: "unidata/tomcat-docker:10.1.0-jdk17-temurin-focal@sha256:99c083fd17d1f8d6c85a0f771039ffb4d2430ff7fd6dabea8eb50f2731328af8" steps: - name: Checkout diff --git a/Dockerfile b/Dockerfile index b26a99c..1d24a34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=unidata/tomcat-docker:10.1.0-jdk17-temurin-focal@sha256:99c083fd17d1f8d6c85a0f771039ffb4d2430ff7fd6dabea8eb50f2731328af8 +ARG BASE_IMAGE=unidata/tomcat-docker:10.1.0-jdk17-openjdk@sha256:8b595bcd8eee410e2d610829b5d4e312d51e3ea6c6bde952a5838845f67a4839 FROM ${BASE_IMAGE} LABEL maintainer="Kyle Wilcox "