commit ef5e1d1f6abdeee4912a2c835a6510aefd362a5a
author pierventre <pier@opennetworking.org> Mon Feb 21 15:32:55 2022 -0800
committer pierventre <pier@opennetworking.org> Wed Feb 23 15:29:44 2022 -0800
tree 371f3d9dddf22aca43461fc74b8432eac678ecce
parent 487fca00ff68280be66567ad352a4c8904a143b5

[SDFAB-1024] Improve Dockerfile for linux

Change-Id: Ifae48859fef1d0c376114905f29a712313023290

TestON/docker/Dockerfile

diff --git a/TestON/docker/Dockerfile b/TestON/docker/Dockerfile
index 2c43893..a05f3a8 100644
--- a/TestON/docker/Dockerfile
+++ b/TestON/docker/Dockerfile
@@ -55,6 +55,10 @@
     chsh -s /bin/bash jenkins && \
     echo jenkins:jenkins | chpasswd
 
+ARG ENV
+
+RUN if [ "$ENV" = "linux" ] ; then groupmod --gid 1001 jenkins && usermod --uid 1001 jenkins ; fi
+
 RUN curl -sS --fail "https://repo1.maven.org/maven2/org/onosproject/onos-releases/2.5.4/onos-admin-2.5.4.tar.gz" | tar zx && \
     mv onos-admin-2.5.4/* /usr/local/bin/ && \
     rm -r onos-admin-2.5.4

TestON/docker/build.sh

diff --git a/TestON/docker/build.sh b/TestON/docker/build.sh
index e9a968d..964a570 100755
--- a/TestON/docker/build.sh
+++ b/TestON/docker/build.sh
@@ -14,6 +14,7 @@
 TEST_ON_DIR="$(cd ${THIS_DIR}/.. && pwd)"
 CONTAINER_FS="${THIS_DIR}/fs"
 DI_UTIL_REPO="git@github.com:opennetworkinglab/bf-di-scripts.git"
+ENV="macos"
 
 mkdir -p "${CONTAINER_FS}/tmp"
 rm -rf "${CONTAINER_FS}/tmp/additional-py-pkgs.txt"
@@ -30,7 +31,10 @@
             git clone "${DI_UTIL_REPO}" "${CONTAINER_FS}/tmp/bf-di-scripts"
             echo "/tmp/bf-di-scripts/4/utility" > "${CONTAINER_FS}/tmp/additional-py-pkgs.txt"
         ;;
+        '--li' )
+            ENV="linux"
+        ;;
     esac
 done
 
-docker build -t teston -f "${THIS_DIR}/Dockerfile" "${TEST_ON_DIR}"
+docker build -t teston -f "${THIS_DIR}/Dockerfile" "${TEST_ON_DIR}" --build-arg ENV=$ENV