Fixes to support updated base image

Author: dcflachs

veracrypt/Dockerfile

@@ -17,7 +17,8 @@ ENV GROUP_ID=100
 ENV UMASK=000
 
 # Gui App Name default is "GUI_APPLICATION"
-ENV APP_NAME="VeraCrypt"
+RUN set-cont-env APP_NAME "VeraCrypt"
+RUN set-cont-env APP_VERSION $VERACRYPT_VERSION
 
 # Default resolution, change if you like
 ENV DISPLAY_WIDTH=1280
@@ -56,16 +57,16 @@ RUN \
 	del-pkg build-dependencies
 
 # Copy X app start script to correct location
-COPY startapp.sh /startapp.sh
+COPY --chmod=777 startapp.sh /startapp.sh
 
 # Copy default configuration file to correct location
 COPY Configuration.xml /defaults/Configuration.xml
 
 # Add veracrypt init script
-COPY veracrypt.sh /etc/cont-init.d/90-veracrypt.sh
+COPY --chmod=777 veracrypt.sh /etc/cont-init.d/90-veracrypt.sh
 
 # Add veracrypt sudoers script
-COPY sudoers.sh /etc/cont-init.d/01-veracrypt-sudoers.sh
+COPY --chmod=777 sudoers.sh /etc/cont-init.d/01-veracrypt-sudoers.sh
 
 # Add dismount script
 COPY --chmod=777 dismount /etc/cont-finish.d/dismount

veracrypt/dismount

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 set -u # Treat unset variables as an error.
 

veracrypt/sudoers.sh

@@ -1,12 +1,12 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 set -e # Exit immediately if a command exits with a non-zero status.
 set -u # Treat unset variables as an error.
 
-echo "$APP_USER ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/veracrypt
+echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/veracrypt
 
 chmod 440 /etc/sudoers.d/veracrypt
 
 # echo "Defaults logfile=/var/log/sudo" > /etc/sudoers.d/logging
 
-# chmod 440 /etc/sudoers.d/logging
+# chmod 440 /etc/sudoers.d/loggingdocke

veracrypt/veracrypt.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 set -e # Exit immediately if a command exits with a non-zero status.
 set -u # Treat unset variables as an error.
@@ -16,4 +16,4 @@ fi
 # Adjust ownership of /config.
 chown -R $USER_ID:$GROUP_ID /config
 # Adjust ownership of /disks
-chown -R $USER_ID:$GROUP_ID /mnt/disks
+chown -R $USER_ID:$GROUP_ID /mnt/disks