UNCLASSIFIED

Skip to content

GitLab

Commit 2d5a7cf1 authored by Michael Freeman's avatar Michael Freeman
Browse files

Merge branch 'mfreeman-feature' into 'development' 

Mfreeman feature

See merge request !50
parents 43caa4f6 68599508
Pipeline #390887 passed with stages
in 15 minutes and 15 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
Dockerfile
View file @ 2d5a7cf1
ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/opensource/nodejs/nodejs14 ARG BASE_IMAGE=ironbank/opensource/nodejs/nodejs16
ARG BASE_TAG=14.17.1 ARG BASE_TAG=16.5.0
FROM lovasoa/wbo:v1.14.4 as base FROM lovasoa/wbo:v1.14.5 as base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
......
hardening_manifest.yaml
View file @ 2d5a7cf1
...@@ -8,13 +8,13 @@ name: "opensource/lovasoa/wbo" ...@@ -8,13 +8,13 @@ name: "opensource/lovasoa/wbo"
# 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:
- "v1.14.4" - "v1.14.5"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
args: args:
BASE_IMAGE: "opensource/nodejs/nodejs14" BASE_IMAGE: "opensource/nodejs/nodejs16"
BASE_TAG: "14.17.3" BASE_TAG: "16.5.0"
# Docker image labels # Docker image labels
labels: labels:
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://github.com/lovasoa/whitebophir" org.opencontainers.image.url: "https://github.com/lovasoa/whitebophir"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "lovasoa" org.opencontainers.image.vendor: "lovasoa"
org.opencontainers.image.version: "v1.14.4" org.opencontainers.image.version: "v1.14.5"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "opensource" mil.dso.ironbank.image.keywords: "opensource"
## 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: lovasoa/wbo:v1.14.4 - tag: lovasoa/wbo:v1.14.5
url: docker://docker.io/lovasoa/wbo@sha256:3b8ddeec9d6504487de10b632ecc59c6d32ccbe08e6e97e2d46b4350b490822e url: docker://docker.io/lovasoa/wbo@sha256:44164641df2c3c8f362aa2adf2865fed762ba70f47becdffeccb04d489c18799
# - filename: statsd-client-0.4.7.tgz # - filename: statsd-client-0.4.7.tgz
# url: https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.7.tgz # url: https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.7.tgz
# validation: # validation:
......
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