UNCLASSIFIED

Commit 65be04f8 authored by Andy Maksymowicz's avatar Andy Maksymowicz
Browse files

Merge branch 'andymaks-master-patch-96346' into 'master'

Andymaks master patch 96346

See merge request !36
parents c0325f68 416281b2
Pipeline #383133 failed with stages
in 37 seconds
...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ...@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk8 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk8
ARG BASE_TAG=1.8.0 ARG BASE_TAG=1.8.0
FROM tomcat:10.0.7-jdk8-openjdk AS base FROM tomcat:10.0.8-jdk8-openjdk AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
...@@ -8,7 +8,7 @@ name: "opensource/apache/tomcat-openjdk8" ...@@ -8,7 +8,7 @@ name: "opensource/apache/tomcat-openjdk8"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "10.0.7" - "10.0.8"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://hub.docker.com/_/tomcat" org.opencontainers.image.url: "https://hub.docker.com/_/tomcat"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Apache" org.opencontainers.image.vendor: "Apache"
org.opencontainers.image.version: "10.0.7" org.opencontainers.image.version: "10.0.8"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
# mil.dso.ironbank.image.keywords: "FIXME" # mil.dso.ironbank.image.keywords: "FIXME"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -37,8 +37,8 @@ labels: ...@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- tag: tomcat:10.0.7-jdk8-openjdk - tag: tomcat:10.0.8-jdk8-openjdk
url: docker://docker.io/tomcat@sha256:3d45f922bee3fc2711bda1c353e85031b82167a0b023e06fc099e0db81bb6e18 url: docker://docker.io/tomcat@sha256:59e3613ba86cd65d8cfc1c854c082420a6a7e7c320bc5217e7d4d4c576bb9c7f
# List of project maintainers # List of project maintainers
# FIXME: Fill in the following details for the current container owner in the whitelist # FIXME: Fill in the following details for the current container owner in the whitelist
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment