UNCLASSIFIED

Commit 3b066f9b authored by Jeffrey Weatherford's avatar Jeffrey Weatherford
Browse files

Merge branch 'v0.0.6' into 'development'

Upgrading nodejs version and other clean-ups

See merge request !12
parents cf37dae5 bf5c686c
Pipeline #189685 passed with stages
in 12 minutes and 25 seconds
ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=opensource/nodejs/nodejs12 ARG BASE_IMAGE=opensource/nodejs/nodejs12
ARG BASE_TAG=12.20.0 ARG BASE_TAG=12.20.1
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
...@@ -10,7 +9,7 @@ USER root ...@@ -10,7 +9,7 @@ USER root
WORKDIR /opt/innosabi/stylepack WORKDIR /opt/innosabi/stylepack
RUN \ RUN \
dnf -y update && dnf -y install nodejs 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
...@@ -20,6 +19,4 @@ COPY ["node-sass_binding.node", "/opt/innosabi/stylepack/node_modules/node-sass/ ...@@ -20,6 +19,4 @@ COPY ["node-sass_binding.node", "/opt/innosabi/stylepack/node_modules/node-sass/
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 101 USER 1001
# stylepack LICENSE: COMMERCIAL
(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.5" - "0.0.6"
- "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.0" BASE_TAG: "12.20.1"
# Docker image labels # Docker image labels
labels: labels:
......
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