UNCLASSIFIED

Skip to content

GitLab

Commit b548dfe7 authored by Hunter Stevens's avatar Hunter Stevens
Browse files

Merge branch 'development' into 'master' 

Development

See merge request !49
parents 3ef6955c f501a6ac
Pipeline #443844 passed with stages
in 13 minutes and 46 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Dockerfile
View file @ b548dfe7
...@@ -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/openjdk11 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
ARG BASE_TAG=1.11 ARG BASE_TAG=1.11
FROM tomcat:9.0.50-jdk11-openjdk AS base FROM tomcat:9.0.52-jdk11-openjdk AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
hardening_manifest.yaml
View file @ b548dfe7
...@@ -8,7 +8,7 @@ name: "opensource/apache/tomcat9-openjdk11" ...@@ -8,7 +8,7 @@ name: "opensource/apache/tomcat9-openjdk11"
# 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:
- "9.0.50" - "9.0.52"
- "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://tomcat.apache.org/" org.opencontainers.image.url: "https://tomcat.apache.org/"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "opensource" org.opencontainers.image.vendor: "opensource"
org.opencontainers.image.version: "9.0.50" org.opencontainers.image.version: "9.0.52"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "Apache,Tomcat9,tomcat,JDK,server" mil.dso.ironbank.image.keywords: "Apache,Tomcat9,tomcat,JDK,server"
## 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:
- url: "docker://docker.io/tomcat@sha256:edd50c648b4c10ce85cd1c2f0dffc235794c4f806464612dd7c4af7bd9c3b957" - url: "docker://docker.io/tomcat@sha256:e47d48c4fb7ae34d35aae0dc068e84fd9be37a217a46033f22a3626dea839b8f"
tag: "tomcat:9.0.50-jdk11-openjdk" tag: "tomcat:9.0.52-jdk11-openjdk"
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
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

UNCLASSIFIED