X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=Dockerfile;h=6a57a7ee4668ada1a75f1e31aa6ef5f4ac597e77;hb=e4bbf8687d086ef5512e9ff916306e372b0de4cc;hp=8872e4e3e3665711893201dca49a8f2a3f156c57;hpb=78ba273b279a7e7af6dba811a29746b881a53a8e;p=ric-plt%2Fa1.git

diff --git a/Dockerfile b/Dockerfile
old mode 100644
new mode 100755
index 8872e4e..6a57a7e
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,10 +17,9 @@
 
 # This container uses a 2 stage build!
 # Tips and tricks were learned from: https://pythonspeed.com/articles/multi-stage-docker-python/
-FROM python:3.7-alpine AS compile-image
-# Gevent needs gcc
-RUN apk update && apk add gcc musl-dev
-# do the install of a1
+FROM python:3.8-alpine AS compile-image
+# Gevent needs gcc, make, file, ffi
+RUN apk update && apk add gcc musl-dev make file libffi-dev
 
 # Switch to a non-root user for security reasons
 # This is only really needed in stage 2 however this makes the copying easier and straitforward! --user doesn't do the same thing if run as root!
@@ -35,14 +34,13 @@ RUN pip install --user /home/a1user
 
 ###########
 # 2nd stage
-FROM python:3.7-alpine
+FROM python:3.8-alpine
 # dir that rmr routing file temp goes into
 RUN mkdir -p /opt/route/
 # python copy; this basically makes the 2 stage python build work
 COPY --from=compile-image /home/a1user/.local /home/a1user/.local
-# copy rmr .sos from the builder image
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
+# copy rmr .so from the builder image
+COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:5-a3.11-nng-rmr3 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so
 # Switch to a non-root user for security reasons. a1 does not currently write into any dirs so no chowns are needed at this time.
 RUN addgroup -S a1user && adduser -S -G a1user a1user
 USER a1user