Eliminate "ci" user from the built pacxx images

It is customary for images to default to the root user

Closes: 38

.gitlab-ci.yml

@@ -2,6 +2,8 @@ variables:
   REGISTRY: registry.dune-project.org
   JOB_REPO: $REGISTRY/$CI_PROJECT_PATH:$CI_JOB_NAME
   PIPELINE_TAG: $CI_COMMIT_REF_SLUG.$CI_PIPELINE_IID
+  NATIVE_BASE: ubuntu:16.04
+  CUDA_BASE: nvidia/cuda:9.0-devel-ubuntu16.04
 
 stages:
 - utils
@@ -79,12 +81,12 @@ utils:
 base-native:
   extends: .base
   variables:
-    FROM: ubuntu:16.04
+    FROM: $NATIVE_BASE
 
 base-cuda:
   extends: .base
   variables:
-    FROM: nvidia/cuda:9.0-devel-ubuntu16.04
+    FROM: $CUDA_BASE
 
 stop-base:
   extends: .stop
@@ -201,9 +203,7 @@ pacxx-native:
   dependencies:
   - pacxx-build-native
   variables:
-    # not working due to GitLab-runners variable expansion beeing not recursive
-    # BUILD_ARG: TAG=base-native.$PIPELINE_TAG
-    BUILD_ARG: TAG=base-native.$CI_COMMIT_REF_SLUG.$CI_PIPELINE_IID
+    BUILD_ARG: FROM=$NATIVE_BASE
     CONTEXT: pacxx
 
 pacxx-cuda:
@@ -211,9 +211,7 @@ pacxx-cuda:
   dependencies:
   - pacxx-build-cuda
   variables:
-    # not working due to GitLab-runners variable expansion beeing not recursive
-    # BUILD_ARG: TAG=base-cuda.$PIPELINE_TAG
-    BUILD_ARG: TAG=base-cuda.$CI_COMMIT_REF_SLUG.$CI_PIPELINE_IID
+    BUILD_ARG: FROM=$CUDA_BASE
     CONTEXT: pacxx
 
 pacxx-perftest-2.6:

pacxx/Dockerfile

-ARG TAG
-FROM registry.dune-project.org/joe/pacxx-docker:$TAG
+ARG FROM
+FROM $FROM
+
+RUN set -ex;                                            \
+    export DEBIAN_FRONTEND=noninteractive;              \
+    apt-get update;                                     \
+    apt-get upgrade --no-install-recommends --yes;      \
+    apt-get install --no-install-recommends --yes       \
+      build-essential                                   \
+      cmake                                             \
+      libpapi5.4.3                                      \
+      libtbb2                                           \
+      libthrust-dev                                     \
+      ninja-build                                       \
+      python                                            \
+      ;                                                 \
+    apt-get clean;                                      \
+    rm -rf /var/lib/apt/lists/*
 
 COPY --chown=root:root opt/pacxx /opt/pacxx
 ENV PATH=/opt/pacxx/bin:$PATH