update dir locations and add goss test

workbench-session-init/Dockerfile.ubuntu2204

@@ -1,4 +1,4 @@
-FROM ubuntu:noble AS build
+FROM ubuntu:22.04 AS build
 
 # Install required tools:
 # - ca-certificates installs necessary certificates to use cURL with HTTPS websites
@@ -13,14 +13,13 @@ ARG RSW_VERSION=2024.09.0+375.pro3
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN mkdir -p /pwb-staging && \
     RSW_VERSION_URL=$(echo -n "${RSW_VERSION}" | sed 's/+/-/g') && \
+    echo "Downloading https://s3.amazonaws.com/rstudio-ide-build/session/multi/x86_64/rsp-session-multi-${RSW_VERSION_URL}-x86_64.tar.gz" && \
     curl -fsSL -o /pwb-staging/rsp-session-multi.tar.gz "https://s3.amazonaws.com/rstudio-ide-build/session/multi/x86_64/rsp-session-multi-${RSW_VERSION_URL}-x86_64.tar.gz" && \
-    mkdir -p /session-components && \
-    tar -C /session-components -xf /pwb-staging/rsp-session-multi.tar.gz && \
-    chmod -R 755 /session-components && \
+    mkdir -p /opt/session-components && \
+    tar -C /opt/session-components -xf /pwb-staging/rsp-session-multi.tar.gz && \
+    chmod -R 755 /opt/session-components && \
     rm -rf /pwb-staging
 
-#COPY rstudio-server/ /usr/lib/rstudio-server/
+COPY --chmod=755 run.sh /usr/local/bin/run.sh
 
-COPY --chmod=755 run.sh /run.sh
-
-ENTRYPOINT ["/run.sh"]
+ENTRYPOINT ["/usr/local/bin/run.sh"]

workbench-session-init/run.sh

@@ -3,6 +3,8 @@
 set -e
 set -x
 
+S=/opt/session-components
+
 # The target should exist and be an empty directory.
 T=/mnt/init
 
@@ -12,4 +14,4 @@ if [ ! -d "${T}" ] ; then
 fi
 
 echo "Copying files from /session-components to /mnt/init"
-time cp -r /session-components/* /mnt/init
+time cp -r $S/* $T

workbench-session-init/test/goss.yaml

@@ -0,0 +1,13 @@
+package:
+  curl:
+    installed: true
+
+file:
+  /opt/session-components/:
+    exists: true
+    mode: "0755"
+    filetype: directory
+  /usr/local/bin/run.sh:
+    exists: true
+    filetype: file
+    mode: "0755"

workbench-session-init/test/run_tests.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# install goss
+GOSS_FILE=${GOSS_FILE:-/test/goss.yaml}
+GOSS_VERSION=${GOSS_VERSION:-0.4.6}
+GOSS_MAX_CONCURRENT=${GOSS_MAX_CONCURRENT:-50}
+
+if [ -f /etc/debian_version ]; then
+  OS="ubuntu"
+else
+  echo "OS not supported. Exiting"
+  exit 1
+fi
+
+# install goss to tmp location and make executable
+curl -fsSL https://github.com/aelsabbahy/goss/releases/download/v$GOSS_VERSION/goss-linux-amd64 -o /tmp/goss \
+  && chmod +x /tmp/goss \
+  && GOSS=/tmp/goss
+
+OS=$OS GOSS_FILE=$GOSS_FILE $GOSS v --format documentation --max-concurrent $GOSS_MAX_CONCURRENT