Add non-default tests

Author: Chuxel

.github/workflows/script-library.yml

@@ -14,6 +14,7 @@ jobs:
     strategy:
       matrix:
         os: ["debian:bullseye", "debian:buster", "ubuntu:focal", "ubuntu:bionic", alpine, centos, "mcr.microsoft.com/oryx/build:github-actions-20210902.1"]
+        defaults: ["true", "false"]
       fail-fast: false
     runs-on: ubuntu-latest
     steps:
@@ -34,7 +35,7 @@ jobs:
       id: test_script_library
       run: |
         set -e
-        bash script-library/test/regression/test.sh "${{ matrix.os }}" false true true linux/amd64
+        bash script-library/test/regression/test.sh "${{ matrix.os }}" false "${{ matrix.defaults }}" true linux/amd64
 
   copy-scripts:
     name: Copy and commit script-library updates

script-library/desktop-lite-debian.sh

@@ -273,7 +273,8 @@ EOF
 cat << EOF > /usr/local/share/desktop-init.sh
 #!/bin/bash
 
-USERNAME=${USERNAME}
+user_name="${USERNAME}"
+group_name="$(id -gn ${USERNAME})"
 LOG=/tmp/container-init.log
 
 export DBUS_SESSION_BUS_ADDRESS="${DBUS_SESSION_BUS_ADDRESS:-"autolaunch:"}"
@@ -318,8 +319,8 @@ sudoIf()
 # Use sudo to run as non-root user if not already running
 sudoUserIf()
 {
-    if [ "\$(id -u)" -eq 0 ] && [ "\${USERNAME}" != "root" ]; then
-        sudo -u \${USERNAME} "\$@"
+    if [ "\$(id -u)" -eq 0 ] && [ "\${user_name}" != "root" ]; then
+        sudo -u \${user_name} "\$@"
     else
         "\$@"
     fi
@@ -347,7 +348,7 @@ done
 sudo rm -rf /tmp/.X11-unix /tmp/.X*-lock
 mkdir -p /tmp/.X11-unix
 sudoIf chmod 1777 /tmp/.X11-unix
-sudoIf chown root:\${USERNAME} /tmp/.X11-unix
+sudoIf chown root:\${group_name} /tmp/.X11-unix
 if [ "\$(echo "\${VNC_RESOLUTION}" | tr -cd 'x' | wc -c)" = "1" ]; then VNC_RESOLUTION=\${VNC_RESOLUTION}x16; fi
 screen_geometry="\${VNC_RESOLUTION%*x*}"
 screen_depth="\${VNC_RESOLUTION##*x}"

script-library/test/regression/Dockerfile

@@ -9,13 +9,12 @@ FROM ${IMAGE_TO_TEST}
 
 USER root
 
-ARG USE_DEFAULTS="true"
 ARG USERNAME="vscode"
 ARG RUN_COMMON_SCRIPT="true"
 ARG UPGRADE_PACKAGES="false"
 ARG RUN_ONE="false"
 RUN --mount=target=/script-library,source=.,type=bind,rw \
-    sh /script-library/test/regression/run-scripts.sh /script-library ${USE_DEFAULTS} ${USERNAME} ${RUN_COMMON_SCRIPT} ${UPGRADE_PACKAGES} ${RUN_ONE}
+    sh /script-library/test/regression/run-scripts.sh /script-library true ${USERNAME} ${RUN_COMMON_SCRIPT} ${UPGRADE_PACKAGES} ${RUN_ONE}
 
 ENV DBUS_SESSION_BUS_ADDRESS="autolaunch:" DISPLAY=":1" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8"
 ENTRYPOINT [ "/usr/local/share/docker-init.sh", "/usr/local/share/ssh-init.sh", "/usr/local/share/desktop-init.sh" ]

script-library/test/regression/alt.Dockerfile

@@ -0,0 +1,26 @@
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+# Test non-defaults
+ARG IMAGE_TO_TEST=debian:10
+FROM ${IMAGE_TO_TEST}
+
+# Add non-root user
+USER root
+ARG USERNAME="bort"
+RUN groupadd --gid 1001 the-borts && useradd -s /bin/bash --uid 1001 --gid 1001 -m ${USERNAME}
+
+# Run non-default tests
+ARG RUN_COMMON_SCRIPT="true"
+ARG UPGRADE_PACKAGES="false"
+ARG RUN_ONE="false"
+RUN --mount=target=/script-library,source=.,type=bind,rw \
+    sh /script-library/test/regression/run-scripts.sh /script-library false ${USERNAME} ${RUN_COMMON_SCRIPT} ${UPGRADE_PACKAGES} ${RUN_ONE}
+
+ENV DBUS_SESSION_BUS_ADDRESS="autolaunch:" DISPLAY=":1" LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8"
+ENTRYPOINT [ "/usr/local/share/docker-init.sh", "/usr/local/share/ssh-init.sh", "/usr/local/share/desktop-init.sh" ]
+CMD [ "sleep", "infinity" ]
+
+USER ${USERNAME}

script-library/test/regression/test.sh

@@ -24,15 +24,20 @@ else
     OTHER_ARGS="--builder vscode-dev-containers --platform ${PLATFORMS}"
 fi
 
+if [ "${USE_DEFAULTS}" = "false" ]; then
+    dockerfile_path="test/regression/alt.Dockerfile"
+else
+    dockerfile_path="test/regression/Dockerfile"
+fi
+
 BUILDX_COMMAND="docker buildx build \
     ${OTHER_ARGS} \
     --progress=plain \
     --build-arg IMAGE_TO_TEST=$IMAGE_TO_TEST \
     --build-arg RUN_ONE=${RUN_ONE} \
     --build-arg RUN_COMMON_SCRIPT=${RUN_COMMON_SCRIPT} \
-    --build-arg USE_DEFAULTS=${USE_DEFAULTS}
     -t vscdc-script-library-regression \
-    -f test/regression/Dockerfile \
+    -f ${dockerfile_path} \
     ."
 echo $BUILDX_COMMAND
 $BUILDX_COMMAND