Revise Dockerfile

Author: scheibel

Dockerfile

@@ -1,61 +1,53 @@
-ARG BASE=ubuntu:20.04
+ARG BASE=cginternals/graphics-base:latest
+ARG BASE_DEV=cginternals/graphics-base:dev
 ARG PROJECT_NAME=glkernel
-ARG WORKSPACE=/workspace
 
 # BUILD
 
-FROM $BASE AS glkernel-build
+FROM $BASE_DEV AS build
 
 ARG PROJECT_NAME
-ARG WORKSPACE
 ARG COMPILER_FLAGS="-j 4"
 
-ENV DEBIAN_FRONTEND=noninteractive
+ENV glkernel_DIR="$WORKSPACE/$PROJECT_NAME"
 
-RUN apt update
-RUN apt install -y --no-install-recommends sudo \
-    && echo 'user ALL=(ALL) NOPASSWD: ALL' >/etc/sudoers.d/user
-RUN apt install -y --no-install-recommends --reinstall ca-certificates
-RUN apt install -y --no-install-recommends cmake git build-essential
+WORKDIR $WORKSPACE/$PROJECT_NAME
 
-ENV PROJECT_DIR="$WORKSPACE/$PROJECT_NAME"
+ADD cmake cmake
+ADD docs docs
+ADD deploy deploy
+ADD source source
+ADD CMakeLists.txt CMakeLists.txt
+ADD configure configure
+ADD $PROJECT_NAME-config.cmake $PROJECT_NAME-config.cmake
+ADD LICENSE LICENSE
+ADD README.md README.md
+ADD AUTHORS AUTHORS
 
-WORKDIR $WORKSPACE
+RUN ./configure
+RUN CMAKE_OPTIONS="-DOPTION_BUILD_TESTS=Off" ./configure
+RUN cmake --build build -- $COMPILER_FLAGS
 
-RUN git clone --depth=1 --branch=0.9.9.8 https://github.com/g-truc/glm.git
-ENV glm_DIR=$WORKSPACE/glm/cmake
+# INSTALL
 
-ADD cmake $PROJECT_NAME/cmake
-ADD docs $PROJECT_NAME/docs
-ADD deploy $PROJECT_NAME/deploy
-ADD source $PROJECT_NAME/source
-ADD CMakeLists.txt $PROJECT_NAME/CMakeLists.txt
-ADD configure $PROJECT_NAME/configure
-ADD $PROJECT_NAME-config.cmake $PROJECT_NAME/$PROJECT_NAME-config.cmake
-ADD LICENSE $PROJECT_NAME/LICENSE
-ADD README.md $PROJECT_NAME/README.md
-ADD AUTHORS $PROJECT_NAME/AUTHORS
+FROM build as install
 
-ENV CMAKE_PREFIX_PATH=$WORKSPACE
+ARG PROJECT_NAME
 
-WORKDIR $PROJECT_DIR
-RUN ./configure
-RUN CMAKE_OPTIONS="-DOPTION_BUILD_TESTS=Off -DCMAKE_INSTALL_PREFIX=$WORKSPACE/$PROJECT_NAME-install" ./configure
-RUN cmake --build build -- $COMPILER_FLAGS
+WORKDIR $WORKSPACE/$PROJECT_NAME
+
+RUN CMAKE_OPTIONS="-DCMAKE_INSTALL_PREFIX=$WORKSPACE/$PROJECT_NAME-install" ./configure
 RUN cmake --build build --target install
 
 # DEPLOY
 
-FROM $BASE AS cppexpose
+FROM $BASE AS deploy
 
 ARG PROJECT_NAME
-ARG WORKSPACE
-
-ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt update
-RUN apt install -y --no-install-recommends cmake
+ENV glm_DIR="$WORKSPACE/glm"
+ENV glkernel_DIR="$WORKSPACE/$PROJECT_NAME"
 
-COPY --from=glkernel-build $WORKSPACE/glm $WORKSPACE/glm
+COPY --from=build $WORKSPACE/glm $WORKSPACE/glm
 
-COPY --from=glkernel-build $WORKSPACE/$PROJECT_NAME-install $WORKSPACE/$PROJECT_NAME
+COPY --from=install $WORKSPACE/$PROJECT_NAME-install $WORKSPACE/$PROJECT_NAME