UNCLASSIFIED

Commit e9b10da2 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master'

Development

See merge request !46
parents 629cf18d 7d635acc
Pipeline #445625 passed with stages
in 21 minutes and 48 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.8-jdk8-openjdk AS base FROM tomcat:10.0.10-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.8" - "10.0.10"
- "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.8" org.opencontainers.image.version: "10.0.10"
## 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,18 +37,18 @@ labels: ...@@ -37,18 +37,18 @@ 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.8-jdk8-openjdk - tag: tomcat:10.0.10-jdk8-openjdk
url: docker://docker.io/tomcat@sha256:cc40f931939569057308fdc8e6ac9440a82bbe8e14e70940ddd393596e400ada url: docker://docker.io/tomcat@sha256:0e8d7b37329830a9a64815bc6f617403c7d9d3505bcd1f6541ce6b99e3b713cb
# 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
# FIXME: Include any other vendor information if applicable # FIXME: Include any other vendor information if applicable
maintainers: maintainers:
- email: "andre.maksymowicz@centauricorp.com" - email: "andrii@alphabravo.io"
# # The name of the current container owner # # The name of the current container owner
name: "Blake Hearn" name: "Andrii Panchuk"
# # The gitlab username of the current container owner # # The gitlab username of the current container owner
username: "bhearn" username: "andriipanchuk"
cht_member: true cht_member: true
# - name: "FIXME" # - name: "FIXME"
# username: "FIXME" # username: "FIXME"
......
{ {
"assignees": [ "assignees": [
"bhearn" "andriipanchuk"
], ],
"baseBranches": [ "baseBranches": [
"development" "development"
......
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