UNCLASSIFIED

Commit bd0c0323 authored by kwami.delali's avatar kwami.delali
Browse files

Merge branch 'v21.13' into 'development'

Upgrade to V21.13

See merge request !13
parents 3b066f9b 4609bb0a
Pipeline #213056 passed with stages
in 15 minutes and 29 seconds
ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=opensource/nodejs/nodejs12 ARG BASE_IMAGE=ironbank/opensource/nodejs/nodejs12
ARG BASE_TAG=12.20.1 ARG BASE_TAG=12.20.1
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...@@ -8,15 +8,16 @@ USER root ...@@ -8,15 +8,16 @@ USER root
WORKDIR /opt/innosabi/stylepack WORKDIR /opt/innosabi/stylepack
RUN \ RUN dnf -y update
dnf -y update
COPY ["stylepack.gz", "/opt/innosabi"] COPY ["stylepack.gz", "/opt/innosabi"]
RUN cd /opt/innosabi && tar -zxvf stylepack.gz && rm stylepack.gz RUN cd /opt/innosabi && tar -zxvf stylepack.gz && rm stylepack.gz
COPY ["node-sass_binding.node", "/opt/innosabi/stylepack/node_modules/node-sass/vendor/linux-x64-72/binding.node"] COPY ["node-sass_binding.node", "/opt/innosabi/stylepack/node_modules/node-sass/vendor/linux-x64-72/binding.node"]
# Remove vulnerable tests
RUN rm -rf /opt/innosabi/stylepack/node_modules/node-gyp/test RUN rm -rf /opt/innosabi/stylepack/node_modules/node-gyp/test
ENTRYPOINT node start.js ENTRYPOINT node start.js
USER 1001 USER 1001
LICENSE: COMMERCIAL LICENSE: COMMERCIAL
(c) 2020 Collaboration.Ai (c) 2020-2021 Collaboration.Ai
You need to acquire a license from Collaboration.Ai to use this product. This product includes open source software. You need to acquire a license from Collaboration.Ai to use this product. This product includes open source software.
The source code of the open source parts and its licenses is included or can be requested. The source code of the open source parts and its licenses is included or can be requested.
......
LICENSE: COMMERCIAL Stylepack for CrowdVector. This container provides functionality for styling of the application
(c) 2020 Collaboration.Ai
You need to acquire a license from Collaboration.Ai to use this product. This product includes open source software.
The source code of the open source parts and its licenses is included or can be requested.
Collaboration.Ai, 1120 S. 2nd St. Unit 811, Minneapolis, MN 55415
...@@ -8,13 +8,13 @@ name: "collaborationai/crowd-vector/stylepack" ...@@ -8,13 +8,13 @@ name: "collaborationai/crowd-vector/stylepack"
# 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:
- "0.0.6" - "21.13"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
args: args:
BASE_IMAGE: "opensource/nodejs/nodejs12" BASE_IMAGE: "opensource/nodejs/nodejs12"
BASE_TAG: "12.20.1" BASE_TAG: "12.21.0"
# Docker image labels # Docker image labels
labels: labels:
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://collaboration.ai/products/crowdvector/" org.opencontainers.image.url: "https://collaboration.ai/products/crowdvector/"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "Collaboration.Ai" org.opencontainers.image.vendor: "Collaboration.Ai"
org.opencontainers.image.version: "0.0.5" org.opencontainers.image.version: "21.13"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "CrowdVector" mil.dso.ironbank.image.keywords: "CrowdVector"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -38,12 +38,12 @@ labels: ...@@ -38,12 +38,12 @@ 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:
- filename: stylepack.gz - filename: stylepack.gz
url: https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/stylepack/stylepack.tar.gz url: https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/stylepack/stylepack-21.13.tar.gz
validation: validation:
type: sha256 type: sha256
value: 78ee6ec83f728de65afb04e64b186b649a889608d586ba0f1a69299b8dc97892 value: 320c8fe7d7bcb1453c7715e8e873c36ade4a863a8a640042a0c95db289881c18
- filename: node-sass_binding.node - filename: node-sass_binding.node
url: https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/stylepack/node-sass_binding.node url: https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/stylepack/node-sass_binding.node
validation: validation:
type: sha256 type: sha256
value: 08fb3cdf154dd5bade912f6e83bc3401b331367580fd122a9eb5ff260c594949 value: 08fb3cdf154dd5bade912f6e83bc3401b331367580fd122a9eb5ff260c594949
...@@ -52,12 +52,11 @@ resources: ...@@ -52,12 +52,11 @@ resources:
# 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: "fedramp_admin@collaboration.ai" - email: "jay@collaboration.ai"
# # The name of the current container owner name: "Jay Punnackal"
name: "Collaboration.Ai" username: "jpunnackal"
# # The gitlab username of the current container owner - name: "Delali Kwami"
username: "crowdvector" username: "kwami.delali"
# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT email: "kwami.delali@solute.us"
# name: "FIXME" cht_member: true
# username: "FIXME"
# email: "FIXME"
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