projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug with SA08 when updating prometheus.yaml
[osm/devops.git]
/
docker
/
NBI
/
Dockerfile
diff --git
a/docker/NBI/Dockerfile
b/docker/NBI/Dockerfile
index
0f0866a
..
f128f73
100644
(file)
--- a/
docker/NBI/Dockerfile
+++ b/
docker/NBI/Dockerfile
@@
-16,16
+16,16
@@
########################################################################
########################################################################
-FROM ubuntu:
18
.04 as INSTALL
+FROM ubuntu:
20
.04 as INSTALL
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 \
- gcc=4:
7.4
.* \
- python3=3.
6
.* \
- python3-dev=3.
6
.* \
- python3-
setuptools=39.0.
* \
-
curl=7.58.* &&
\
- python3 -m easy_install pip==21.0.1
+ gcc=4:
9.3
.* \
+ python3=3.
8
.* \
+ python3-dev=3.
8
.* \
+ python3-
pip=20.0.2
* \
+
python3-setuptools=45.2.*
\
+ curl=7.68.*
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_IM_URL
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_IM_URL
@@
-45,29
+45,42
@@
RUN pip3 install \
-r /usr/lib/python3/dist-packages/osm_im/requirements.txt \
-r /usr/lib/python3/dist-packages/osm_nbi/requirements.txt
-r /usr/lib/python3/dist-packages/osm_im/requirements.txt \
-r /usr/lib/python3/dist-packages/osm_nbi/requirements.txt
-FROM ubuntu:18.04 as FINAL
+#######################################################################################
+FROM ubuntu:20.04 as FINAL
+
+ARG APT_PROXY
+RUN if [ ! -z $APT_PROXY ] ; then \
+ echo "Acquire::http::Proxy \"$APT_PROXY\";" > /etc/apt/apt.conf.d/proxy.conf ;\
+ echo "Acquire::https::Proxy \"$APT_PROXY\";" >> /etc/apt/apt.conf.d/proxy.conf ;\
+ fi
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
- DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.*
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ python3-minimal=3.8.* \
+ && rm -rf /var/lib/apt/lists/*
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
-COPY --from=INSTALL /usr/local/lib/python3.
6/dist-packages /usr/local/lib/python3.6
/dist-packages
+COPY --from=INSTALL /usr/local/lib/python3.
8/dist-packages /usr/local/lib/python3.8
/dist-packages
-RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
+# Creating the user for the app
+RUN groupadd -g 1000 appuser && \
+ useradd -u 1000 -g 1000 -d /app appuser && \
+ mkdir -p /app/osm_nbi && \
+ mkdir -p /app/storage/kafka && \
+ mkdir /app/log && \
+ chown -R appuser:appuser /app
WORKDIR /app/osm_nbi
WORKDIR /app/osm_nbi
+# Changing the security context
+USER appuser
+
EXPOSE 9999
RUN cp -R /usr/lib/python3/dist-packages/osm_nbi/html_public /app/osm_nbi/html_public
RUN cp /usr/lib/python3/dist-packages/osm_nbi/nbi.cfg /app/osm_nbi/
RUN cp -R /usr/lib/python3/dist-packages/osm_nbi/http /app/osm_nbi/
EXPOSE 9999
RUN cp -R /usr/lib/python3/dist-packages/osm_nbi/html_public /app/osm_nbi/html_public
RUN cp /usr/lib/python3/dist-packages/osm_nbi/nbi.cfg /app/osm_nbi/
RUN cp -R /usr/lib/python3/dist-packages/osm_nbi/http /app/osm_nbi/
-# Used for local storage
-VOLUME /app/storage
-# Used for logs
-VOLUME /app/log
-
# The following ENV can be added with "docker run -e xxx' to configure
# server
ENV OSMNBI_SOCKET_HOST 0.0.0.0
# The following ENV can be added with "docker run -e xxx' to configure
# server
ENV OSMNBI_SOCKET_HOST 0.0.0.0
@@
-110,4
+123,3
@@
HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
# Run app.py when the container launches
CMD python3 -m osm_nbi.nbi
# Run app.py when the container launches
CMD python3 -m osm_nbi.nbi
-