projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1841: LTS Support K8s, Helm upgrade
[osm/devops.git]
/
docker
/
LCM
/
Dockerfile
diff --git
a/docker/LCM/Dockerfile
b/docker/LCM/Dockerfile
index
530c20b
..
99c198f
100644
(file)
--- a/
docker/LCM/Dockerfile
+++ b/
docker/LCM/Dockerfile
@@
-16,40
+16,36
@@
########################################################################
########################################################################
-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.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
+ 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 install \
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes install \
- apt-transport-https=
1.6.12ubuntu0.2
\
- gnupg2=2.2.
4-1ubuntu1.4
\
- openssh-client
+ apt-transport-https=
2.0.*
\
+ gnupg2=2.2.
*
\
+ openssh-client
=1:8.*
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 \
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.2
0.4
-00
+ && apt-get update && apt-get install -y kubectl=1.2
3.3
-00
-RUN curl https://get.helm.sh/helm-v2.1
5.2-linux-amd64.tar.gz --output helm-v2.15.2
.tar.gz \
- && tar -zxvf helm-v2.1
5.2
.tar.gz \
+RUN curl https://get.helm.sh/helm-v2.1
7.0-linux-amd64.tar.gz --output helm-v2.17.0
.tar.gz \
+ && tar -zxvf helm-v2.1
7.0
.tar.gz \
&& mv linux-amd64/helm /usr/local/bin/helm \
&& rm -r linux-amd64/
&& 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 \
+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/
&& 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_OSM_COMMON_URL
ARG PYTHON3_OSM_LCM_URL
@@
-69,26
+65,39
@@
RUN pip3 install \
-r /usr/lib/python3/dist-packages/osm_lcm/requirements.txt \
-r /usr/lib/python3/dist-packages/n2vc/requirements.txt
-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 && \
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/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/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 --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/ scripts/
+
########################################################################
# Used for local storage
########################################################################
# Used for local storage
@@
-131,6
+140,10
@@
ENV OSMLCM_VCA_HELMPATH /usr/local/bin/helm
ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
ENV OSMLCM_VCA_JUJUPATH /usr/local/bin/juju
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
# logs
# ENV OSMLCM_GLOBAL_LOGFILE /app/log/lcm.log
# ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
@@
-140,5
+153,5
@@
HEALTHCHECK --start-period=120s --interval=30s --timeout=30s --retries=1 \
# Run app.py when the container launches
# Run app.py when the container launches
-CMD
python3 -m osm_lcm.lcm
+CMD
[ "/bin/bash", "scripts/start.sh" ]