Adjust setup to mount Azure file share

Author: wang-arthur

Dockerfile

@@ -161,7 +161,11 @@ RUN apk add openssh \
                      && ssh-keygen -A
 
 # Add SMB Client
-RUN apk add --no-cache samba-client
+RUN apk add --no-cache samba-client curl
+
+# Copy the mount script
+COPY mount-azure-file-share.sh /usr/local/bin/mount-azure-file-share.sh
+RUN chmod +x /usr/local/bin/mount-azure-file-share.sh
 
 # Add themes
 ADD plugins/themes /var/www/html/plugins/themes

entrypoint.sh

@@ -3,38 +3,28 @@ set -e
 
 # Get env vars in the Dockerfile to show up in the SSH session
 eval $(printenv | sed -n "s/^\([^=]\+\)=\(.*\)$/export \1=\2/p" | sed 's/"/\\\"/g' | sed '/=/s//="/' | sed 's/$/"/' >> /etc/profile)
- 
+
+# Mount Azure File Share
+/usr/local/bin/mount-azure-file-share.sh
+
 echo "Starting SSH ..."
 /usr/sbin/sshd
 
 chmod +x /usr/local/bin/ojs-variable
 # Temporary fix for error in ojs-variable (fixed here https://gitlab.com/pkp-org/docker/ojs/-/commit/f4f33f370e7c765b599868f0ca701898c875b47f, but not in stable-3_4_0 branch)
 sed -i 's:/tmp/ojs.config.inc.php:/tmp/config.inc.php:' /usr/local/bin/ojs-variable
 
-# Create required /mnt/azure/ subdirectories if they don't exist
-mkdir -p /mnt/azure/files
-mkdir -p /mnt/azure/public
-
-chown -R apache:www-data /mnt/azure/files
-find /mnt/azure/files -type d -exec chmod 750 {} \;  # for directories
-find /mnt/azure/files -type f -exec chmod 640 {} \;  # for files
-
-# Ensure that /mnt/azure/public is accessible to the web server
-chown -R apache:www-data /mnt/azure/public
-find /mnt/azure/public -type d -exec chmod 750 {} \;  # for directories
-find /mnt/azure/public -type f -exec chmod 640 {} \;  # for files
-
 echo "Adding symlink to persistent /mnt/azure/public directory in web root"
-ln -s /mnt/azure/public /var/www/html/public
+ln -s /mnt/azure/public /var/www/html/public || echo "Symlink already exists"
 
 declare -A configVariable
 if [ -f $SAVED_OJS_CONF ]
 then 
-  echo "Using existing config.inc.php from /mnt/azure/config.inc.php"
+  echo "Using existing config.inc.php from /mnt/azure/files/config.inc.php"
   cp $SAVED_OJS_CONF $OJS_CONF 
 else
   # Set config variables using env variables https://github.com/pkp/ojs/blob/main/config.TEMPLATE.inc.php
-  echo "No existing config in /mnt/azure. Updating OJS config based on env variables..."
+  echo "No existing config in /mnt/azure/files. Updating OJS config based on env variables..."
   # General
   configVariable["installed"]="On"
   # configVariable["base_url"]=$WEBSITE_HOSTNAME
@@ -50,7 +40,7 @@ else
   configVariable["locale"]="en"
   # Files
   configVariable["files_dir"]="/mnt/azure/files"
-  configVariable["public_files_dir"]="../../../mnt/azure/public"
+  configVariable["public_files_dir"]="/mnt/azure/public"
   # Security
   configVariable["force_ssl"]="On"
   configVariable["salt"]=$SALT

mount-azure-file-share.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+
+: "${AZURE_FILE_SHARE_NAME:?Variable not set or empty}"
+: "${AZURE_STORAGE_ACCOUNT_KEY:?Variable not set or empty}"
+: "${AZURE_STORAGE_ACCOUNT_NAME:?Variable not set or empty}"
+: "${MOUNT_POINT:?Variable not set or empty}"
+
+# Create mount point if it doesn't exist
+mkdir -p $MOUNT_POINT
+
+# Mount Azure File Share using the storage account key
+mount -t cifs //$AZURE_STORAGE_ACCOUNT_NAME.file.core.windows.net/$AZURE_FILE_SHARE_NAME $MOUNT_POINT -o vers=3.0,username=$AZURE_STORAGE_ACCOUNT_NAME,password=$AZURE_STORAGE_ACCOUNT_KEY,uid=apache,gid=www-data,dir_mode=0750,file_mode=0640,serverino
+
+# Ensure the mount is successful
+if mountpoint -q $MOUNT_POINT; then
+  echo "Azure File Share mounted successfully at $MOUNT_POINT"
+else
+  echo "Failed to mount Azure File Share at $MOUNT_POINT"
+  exit 1
+fi
+
+# Create required subdirectories if they don't exist
+mkdir -p $MOUNT_POINT/files
+mkdir -p $MOUNT_POINT/public
+
+# Set permissions for the mounted directories
+chown -R apache:www-data $MOUNT_POINT/files
+find $MOUNT_POINT/files -type d -exec chmod 750 {} \;  # for directories
+find $MOUNT_POINT/files -type f -exec chmod 640 {} \;  # for files
+
+# Ensure that $MOUNT_POINT/public is accessible to the web server
+chown -R apache:www-data $MOUNT_POINT/public
+find $MOUNT_POINT/public -type d -exec chmod 750 {} \;  # for directories
+find $MOUNT_POINT/public -type f -exec chmod 640 {} \;  # for files
+
+echo "Permissions set for Azure File Share at $MOUNT_POINT"