-##
-# Copyright 2019 ETSI
+#######################################################################################
+# Copyright ETSI Contributors and Others.
#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-##
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
-########################################################################
+FROM ubuntu:20.04 as INSTALL
-FROM ubuntu:18.04 as INSTALL
+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 && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- gcc=4:7.4.0-1ubuntu2.3 \
- python3=3.6.7-1~18.04 \
- python3-dev=3.6.7-1~18.04 \
- python3-setuptools=39.0.1-2 \
- curl=7.58.0-2ubuntu3.13 && \
- python3 -m easy_install pip==21.0.1
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- apt-transport-https=1.6.12ubuntu0.2 \
- gnupg2=2.2.4-1ubuntu1.4 \
- openssh-client
+ gcc=4:9.3.* \
+ python3=3.8.* \
+ python3-dev=3.8.* \
+ python3-pip=20.0.2* \
+ python3-setuptools=45.2.* \
+ curl=7.68.*
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ apt-transport-https=2.0.* \
+ gnupg2=2.2.* \
+ openssh-client=1:8.*
+
+# https://kubernetes.io/releases/
RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \
&& echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
- && apt-get update && apt-get install -y kubectl=1.20.4-00
+ && apt-get update && apt-get install -y kubectl=1.23.3-00
-RUN curl https://get.helm.sh/helm-v2.15.2-linux-amd64.tar.gz --output helm-v2.15.2.tar.gz \
- && tar -zxvf helm-v2.15.2.tar.gz \
+RUN curl https://get.helm.sh/helm-v2.17.0-linux-amd64.tar.gz --output helm-v2.17.0.tar.gz \
+ && tar -zxvf helm-v2.17.0.tar.gz \
&& mv linux-amd64/helm /usr/local/bin/helm \
&& rm -r linux-amd64/
-RUN curl https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz --output helm-v3.3.4.tar.gz \
- && tar -zxvf helm-v3.3.4.tar.gz \
+# https://github.com/helm/helm/releases
+RUN curl https://get.helm.sh/helm-v3.7.2-linux-amd64.tar.gz --output helm-v3.7.2.tar.gz \
+ && tar -zxvf helm-v3.7.2.tar.gz \
&& mv linux-amd64/helm /usr/local/bin/helm3 \
&& rm -r linux-amd64/
-RUN curl -L https://launchpad.net/juju/2.7/2.7.6/+download/juju-2.7.6-k8s.tar.xz --output juju-2.7.6-k8s.tar.xz \
- && tar -xvf juju-2.7.6-k8s.tar.xz \
- && mv juju /usr/local/bin/juju
-
-
ARG PYTHON3_OSM_COMMON_URL
ARG PYTHON3_OSM_LCM_URL
ARG PYTHON3_N2VC_URL
-r /usr/lib/python3/dist-packages/osm_lcm/requirements.txt \
-r /usr/lib/python3/dist-packages/n2vc/requirements.txt
-FROM ubuntu:18.04
+#######################################################################################
+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 && \
- DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal=3.6.7-1~18.04
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ python3-minimal=3.8.* \
+ && rm -rf /var/lib/apt/lists/*
-RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- ca-certificates
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+ DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+ ca-certificates \
+ && rm -rf /var/lib/apt/lists/*
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
COPY --from=INSTALL /usr/bin/kubectl /usr/bin/kubectl
COPY --from=INSTALL /usr/local/bin/helm /usr/local/bin/helm
COPY --from=INSTALL /usr/local/bin/helm3 /usr/local/bin/helm3
-COPY --from=INSTALL /usr/local/bin/juju /usr/local/bin/juju
+COPY --from=INSTALL /usr/bin/scp /usr/bin/scp
COPY --from=INSTALL /usr/bin/ssh-keygen /usr/bin/ssh-keygen
COPY --from=INSTALL /usr/bin/ssh /usr/bin/ssh
COPY --from=INSTALL /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/
COPY --from=INSTALL /lib/x86_64-linux-gnu/ /lib/x86_64-linux-gnu/
-########################################################################
+COPY scripts/ /app/osm_lcm/scripts/
+
+# Creating the user for the app
+RUN groupadd -g 1000 appuser && \
+ useradd -u 1000 -g 1000 -d /app appuser && \
+ mkdir -p /app/osm_lcm && \
+ mkdir -p /app/storage/kafka && \
+ mkdir /app/log && \
+ chown -R appuser:appuser /app && \
+ chown appuser: /etc/ssl/certs/ca-certificates.crt
+
-# Used for local storage
-VOLUME /app/storage
-# Used for logs
-VOLUME /app/log
+WORKDIR /app/osm_lcm
+
+# Changing the security context
+USER appuser
+
+########################################################################
# The following ENV can be added with "docker run -e xxx' to configure LCM
ENV OSMLCM_RO_HOST ro
ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju
+# helm
+ENV OSMLCM_VCA_STABLEREPOURL https://charts.helm.sh/stable
+# ENV OSMLCM_VCA_HELM_CA_CERTS <ca-cert>
+
# logs
# ENV OSMLCM_GLOBAL_LOGFILE /app/log/lcm.log
# ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \
CMD python3 -m osm_lcm.lcm_hc || exit 1
-
# Run app.py when the container launches
-CMD python3 -m osm_lcm.lcm
-
+CMD [ "/bin/bash", "scripts/start.sh" ]
projects / osm / devops.git / blobdiff