projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1865: Manually scaling VDU from 0 to 1 instance fails
[osm/LCM.git]
/
Dockerfile.local
diff --git
a/Dockerfile.local
b/Dockerfile.local
index
ce1178a
..
23683ea
100644
(file)
--- a/
Dockerfile.local
+++ b/
Dockerfile.local
@@
-13,7
+13,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM ubuntu:
18
.04
+FROM ubuntu:
20
.04
# Set the working directory to /app
WORKDIR /app/LCM
# Set the working directory to /app
WORKDIR /app/LCM
@@
-24,13
+24,13
@@
RUN apt-get update && apt-get install -y curl xz-utils gnupg2 \
&& 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
&& 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
-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/
@@
-54,6
+54,10
@@
RUN git -C /app clone https://osm.etsi.org/gerrit/osm/common.git \
&& python3 -m pip install -e /app/common
# python3-pymongo python3-yaml pycrypto aiokafka
&& python3 -m pip install -e /app/common
# python3-pymongo python3-yaml pycrypto aiokafka
+RUN python3 -m pip install \
+ -r /app/common/requirements.txt \
+ -r /app/N2VC/requirements.txt
+
RUN python3 -m pip install grpcio-tools grpclib
RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
RUN python3 -m pip install grpcio-tools grpclib
RUN mkdir -p /app/storage/kafka && mkdir -p /app/log
@@
-97,12
+101,12
@@
ENV OSMLCM_DATABASE_URI mongodb://mongo:27017
# ENV OSMLCM_DATABASE_USER xxx
# ENV OSMLCM_DATABASE_PASSWORD xxx
# ENV OSMLCM_DATABASE_USER xxx
# ENV OSMLCM_DATABASE_PASSWORD xxx
-#storage
+#
storage
ENV OSMLCM_STORAGE_DRIVER local
ENV OSMLCM_STORAGE_PATH /app/storage
ENV OSMLCM_STORAGE_DRIVER local
ENV OSMLCM_STORAGE_PATH /app/storage
-#ENV OSMLCM_STORAGE_DRIVER mongo
-#
ENV OSMNBI
_STORAGE_URI mongodb://mongo:27017
-#ENV OSMLCM_STORAGE_COLLECTION files
+#
ENV OSMLCM_STORAGE_DRIVER mongo
+#
ENV OSMLCM
_STORAGE_URI mongodb://mongo:27017
+#
ENV OSMLCM_STORAGE_COLLECTION files
# message
ENV OSMLCM_MESSAGE_DRIVER kafka
# message
ENV OSMLCM_MESSAGE_DRIVER kafka
@@
-125,6
+129,9
@@
ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
# Copy the current directory contents into the container at /app/LCM
ADD . /app/LCM
# Copy the current directory contents into the container at /app/LCM
ADD . /app/LCM
+RUN python3 -m pip install \
+ -r requirements.txt
+
# Run app.py when the container launches
CMD python3 -m osm_lcm.lcm
# Run app.py when the container launches
CMD python3 -m osm_lcm.lcm