Merge remote-tracking branch 'junhao/package-image' into package-image

# Conflicts:
#	tools/docker-images/clp-package/Dockerfile

Author: junhaoliao

tools/docker-images/clp-package/Dockerfile

@@ -5,8 +5,8 @@ COPY ./build/clp-package /opt/clp
 WORKDIR /root
 
 COPY ./tools/docker-images/clp-package/setup-scripts ./setup-scripts
-RUN ./setup-scripts/install-prebuilt-packages.sh && \
-    rm -rf ./setup-scripts/
+RUN ./setup-scripts/install-prebuilt-packages.sh \
+    && rm -rf ./setup-scripts/
 
 # Remove cached files
 RUN apt-get clean \
@@ -16,9 +16,9 @@ RUN apt-get clean \
 FROM scratch
 COPY --from=base / /
 
-ENV PATH="/opt/clp/sbin:${PATH}"
-ENV PATH="/opt/clp/bin:${PATH}"
-ENV PYTHONPATH="/opt/clp/lib/python3/site-packages"
 ENV CLP_HOME="/opt/clp"
+ENV PATH="${CLP_HOME}/sbin:${PATH}"
+ENV PATH="${CLP_HOME}/bin:${PATH}"
+ENV PYTHONPATH="${CLP_HOME}/lib/python3/site-packages"
 
 USER 1000:1000