Bump to OOD version 3.0

Author: aebruno

ondemand/Dockerfile

@@ -1,9 +1,8 @@
 ARG HPCTS_VERSION=latest
 
 FROM --platform=linux/amd64 ubccr/hpcts:slurm-${HPCTS_VERSION} as stage-amd64
-RUN dnf install -y https://yum.osc.edu/ondemand/2.0/ondemand-release-web-2.0-1.noarch.rpm
+RUN dnf install -y https://yum.osc.edu/ondemand/3.0/ondemand-release-web-3.0-1.noarch.rpm
 RUN dnf install -y netcat ondemand ondemand-dex
-RUN sed -i 's/\-nohttpd//' /opt/ood/ondemand/root/usr/share/gems/2.7/ondemand/2.0.27/gems/ood_core-0.19.0/lib/ood_core/batch_connect/templates/vnc.rb
 
 FROM --platform=linux/arm64 ubccr/hpcts:slurm-${HPCTS_VERSION} as stage-arm64
 RUN dnf install -y file lsof sudo gcc gcc-c++ git \
@@ -16,7 +15,6 @@ COPY . /build
 RUN /build/install-dex-arm64.sh
 RUN /build/install-passenger-arm64.sh
 RUN /build/install-ood-arm64.sh
-RUN sed -i 's/\-nohttpd//' /usr/share/gems/gems/ood_core-0.19.0/lib/ood_core/batch_connect/templates/vnc.rb
 RUN rm -rf /build
 
 ARG TARGETARCH
@@ -35,6 +33,4 @@ COPY notebook_data /data/notebook_data
 COPY initializers/dashboard.rb /etc/ood/config/apps/dashboard/initializers/dashboard.rb
 COPY themes/hpc-coop /usr/share/ondemand-dex/web/themes/hpc-coop
 
-RUN sed -i '/  passenger_load_shell_envvars off;/a   passenger_preload_bundler on;' /opt/ood/nginx_stage/templates/pun.conf.erb
-
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

ondemand/cluster-config.yml

@@ -13,7 +13,7 @@ v2:
     vnc:
       script_wrapper: |
         export PATH="/opt/TurboVNC/bin:$PATH"
-        export WEBSOCKIFY_CMD="/usr/bin/websockify"
+        export WEBSOCKIFY_CMD="/usr/local/bin/websockify"
         %s
   custom:
     xdmod:

ondemand/install-dex-arm64.sh

@@ -7,8 +7,8 @@ log_info() {
   printf "\n\e[0;35m $1\e[0m\n\n"
 }
 
-DEX_VERSION=${DEX_VERSION:-2.31.1}
-DEX_PATCH_VERSION=${DEX_PATCH_VERSION:-703e26bc109e86d00be22ef1803bdb96b2dc09e2}
+DEX_VERSION=${DEX_VERSION:-2.32.0}
+DEX_PATCH_VERSION=${DEX_PATCH_VERSION:-9366a1969bd656daa1df44e0bdd02f14437ed466}
 
 dnf install -y golang-bin
 log_info "Install dex ${DEX_VERSION}..."

ondemand/install-ood-arm64.sh

@@ -28,7 +28,7 @@ sh autogen.sh
 make && make install
 
 cd $BUILD_DIR
-OOD_VERSION='2.0.27'
+OOD_VERSION='3.0.0'
 wget "https://github.com/OSC/ondemand/archive/refs/tags/v$OOD_VERSION.tar.gz"
 tar -xf "v$OOD_VERSION.tar.gz"
 cd ondemand-$OOD_VERSION

ondemand/install.sh

@@ -38,6 +38,7 @@ ssl:
 node_uri: "/node"
 rnode_uri: "/rnode"
 oidc_scope: "openid profile email groups"
+dex_uri: false
 dex:
   client_redirect_uris:
     - "https://localhost:4443/simplesaml/module.php/authoidcoauth2/linkback.php"