Per #527, get docker build working for apptainer

dtcenter · Jul 3, 2024 · 56011b2 · 56011b2
1 parent 361a0fa
commit 56011b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/internal/scripts/docker/Dockerfile.apptainer b/internal/scripts/docker/Dockerfile.apptainer
@@ -50,7 +50,7 @@ RUN apt update && apt -y upgrade
 #
 # Install additional packages for MariaDB server
 #
-RUN apt -y install --setopt=tsflags=nodocs mariadb-server bind9-utils pwgen psmisc hostname
+RUN apt -y install mariadb-server bind9-utils pwgen psmisc hostname
 
 #
 # Clone the METviewer repository

diff --git a/internal/scripts/docker/fix-permissions.sh b/internal/scripts/docker/fix-permissions.sh
@@ -2,6 +2,8 @@
 # Taken from https://raw.githubusercontent.com/openshift/sti-base/master/bin/fix-permissions
 # Fix permissions on the given directory to allow group read/write of
 # regular files and execute of directories.
-chgrp -R 0 $1
-chmod -R g+rw $1
-find $1 -type d -exec chmod g+x {} +
+if [ -d $1 ]; then 
+  chgrp -R 0 $1
+  chmod -R g+rw $1
+  find $1 -type d -exec chmod g+x {} +
+fi