Merge branch 'master' into isc23

Author: dsajdak

.env

@@ -1,4 +1,4 @@
-HPCTS_VERSION="2022.07"
+HPCTS_VERSION="2023.05"
 SLURM_VERSION="21.08.8-2"
 MARIADB_VERSION=10.3
 MONGODB_VERSION=5.0

coldfront/entrypoint.sh

@@ -24,16 +24,16 @@ then
 
     if ! coldfront show_users_in_project_but_not_in_allocation &> /dev/null; then
         echo "-- Initializing coldfront database..."
-        coldfront initial_setup
-
-        echo "-- Generating static css files..."
-        coldfront collectstatic
+        coldfront initial_setup -f
 
         echo "-- Creating superuser..."
         echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin@localhost', 'admin')" | \
                coldfront shell
     fi
 
+    echo "-- Generating static css files..."
+    coldfront collectstatic --no-input
+
     echo "---> Starting nginx on coldfront..."
     /sbin/nginx
 

coldfront/install.sh

@@ -11,8 +11,7 @@ ARCHTYPE=`uname -m`
 
 log_info "Installing required packages for coldfront.."
 dnf install -y \
-    python3 \
-    python3-devel \
+    python39-devel \
     memcached \
     nginx \
     openssl \

database/coldfront.dump

@@ -16,3 +16,9 @@ EOF
 echo "Granting coldfront user access to coldfront database.."
 echo "grant all on coldfront.* to 'coldfrontapp'@'%';" | mysql -uroot
 echo "flush privileges;" | mysql -uroot
+
+
+if [ -f "/docker-entrypoint-initdb.d/coldfront.dump" ]; then
+    echo "Restoring coldfront database..."
+    mysql -uroot coldfront < /docker-entrypoint-initdb.d/coldfront.dump
+fi

database/create-coldfront-db.sh

@@ -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
@@ -32,9 +30,10 @@ COPY python_job_template /etc/ood/config/apps/myjobs/templates/python
 COPY motd /etc/motd
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 COPY notebook_data /data/notebook_data
-COPY initializers/dashboard.rb /etc/ood/config/apps/dashboard/initializers/dashboard.rb
+COPY initializers /etc/ood/config/apps/dashboard/initializers
 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
+COPY config/dashboard/env /etc/ood/config/apps/dashboard/env
+COPY config/ondemand.yml /etc/ood/config/ondemand.d/ondemand.yml
+COPY config/dashboard/widgets /etc/ood/config/apps/dashboard/views/widgets
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]