projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set global.image.tag as string in values passed to OSM helm chart
[osm/devops.git]
/
docker
/
NG-UI
/
Dockerfile
diff --git
a/docker/NG-UI/Dockerfile
b/docker/NG-UI/Dockerfile
index
418de25
..
628e3da
100644
(file)
--- a/
docker/NG-UI/Dockerfile
+++ b/
docker/NG-UI/Dockerfile
@@
-15,7
+15,7
@@
# limitations under the License.
#######################################################################################
# limitations under the License.
#######################################################################################
-FROM ubuntu:2
0
.04 as INSTALL
+FROM ubuntu:2
2
.04 as INSTALL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
@@
-25,15
+25,16
@@
RUN if [ ! -z $APT_PROXY ] ; then \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- apt-transport-https=2.
0
.* \
- curl=7.
68
.* \
+ apt-transport-https=2.
4
.* \
+ curl=7.
81
.* \
gnupg2=2.2.* \
nginx=1.18.* \
software-properties-common=0.99.* \
gnupg2=2.2.* \
nginx=1.18.* \
software-properties-common=0.99.* \
- xz-utils=5.2.*
+ xz-utils=5.2.* \
+ && rm -rf /var/lib/apt/lists/*
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
- echo "deb https://deb.nodesource.com/node_14.x
focal
main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
+ echo "deb https://deb.nodesource.com/node_14.x
jammy
main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
DEBIAN_FRONTEND=noninteractive apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
@@
-49,7
+50,7
@@
RUN npm install
RUN npm run build
#######################################################################################
RUN npm run build
#######################################################################################
-FROM ubuntu:2
0
.04 AS FINAL
+FROM ubuntu:2
2
.04 AS FINAL
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \
ARG APT_PROXY
RUN if [ ! -z $APT_PROXY ] ; then \