projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Bug 2258 Setting vim_status as ACTIVE if an operation is successful.
[osm/RO.git]
/
Dockerfile.local
diff --git
a/Dockerfile.local
b/Dockerfile.local
index
9958138
..
843e053
100644
(file)
--- a/
Dockerfile.local
+++ b/
Dockerfile.local
@@
-14,7
+14,7
@@
# under the License.
############################################################################
# under the License.
############################################################################
-FROM ubuntu:
18
.04 as INSTALL
+FROM ubuntu:
20
.04 as INSTALL
WORKDIR /build
WORKDIR /build
@@
-55,9
+55,6
@@
RUN python3 -m build /build/RO-VIM-aws && \
RUN python3 -m build /build/RO-VIM-azure && \
python3 -m pip install /build/RO-VIM-azure/dist/*.whl
RUN python3 -m build /build/RO-VIM-azure && \
python3 -m pip install /build/RO-VIM-azure/dist/*.whl
-RUN python3 -m build /build/RO-VIM-fos && \
- python3 -m pip install /build/RO-VIM-fos/dist/*.whl
-
RUN python3 -m build /build/RO-SDN-dynpac && \
python3 -m pip install /build/RO-SDN-dynpac/dist/*.whl
RUN python3 -m build /build/RO-SDN-dynpac && \
python3 -m pip install /build/RO-SDN-dynpac/dist/*.whl
@@
-82,13
+79,19
@@
RUN python3 -m build /build/RO-SDN-arista_cloudvision && \
RUN python3 -m build /build/RO-SDN-juniper_contrail && \
python3 -m pip install /build/RO-SDN-juniper_contrail/dist/*.whl
RUN python3 -m build /build/RO-SDN-juniper_contrail && \
python3 -m pip install /build/RO-SDN-juniper_contrail/dist/*.whl
-FROM ubuntu:18.04
+RUN python3 -m build /build/RO-VIM-gcp && \
+ python3 -m pip install /build/RO-VIM-gcp/dist/*.whl
+
+RUN python3 -m build /build/RO-SDN-tapi && \
+ python3 -m pip install /build/RO-SDN-tapi/dist/*.whl
+
+FROM ubuntu:20.04
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal
COPY --from=INSTALL /usr/lib/python3/dist-packages /usr/lib/python3/dist-packages
RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
DEBIAN_FRONTEND=noninteractive apt-get --yes install python3-minimal
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/genisoimage /usr/bin/genisoimage
COPY --from=INSTALL /etc/protocols /etc/protocols
COPY --from=INSTALL /usr/bin/genisoimage /usr/bin/genisoimage
COPY --from=INSTALL /etc/protocols /etc/protocols