Merge branch 'development'

Author: maxim-voronko

Dockerfile

@@ -25,7 +25,7 @@ ARG APP_ROOT_DIR=$DEPLOYMENT_DIR/WSC
 ARG APP_SERVER_DIR=/opt/WebSpellChecker/AppServer
 ARG APP_NAME_MASK=wsc_app*tar.gz
 ARG USER_NAME=wsc
-ARG PATH_TO_SERVICE_FILES_DIR=/var/lib
+ARG PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
 ARG USER_ID=2000
 ARG GROUP_ID=2000
 
@@ -70,7 +70,7 @@ ENV WEB_PORT=${WEB_PORT}
 ENV VIRTUAL_DIR=${VIRTUAL_DIR}
 ENV WEB_SERVER_TYPE=2
 ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID}
-ENV PATH_TO_SERVICE_FILES_DIR=${PATH_TO_SERVICE_FILES_DIR}
+ENV PATH_TO_SERVICE_FILES_DIRECTORY=${PATH_TO_SERVICE_FILES_DIRECTORY}
 ENV RESTART_WEB_SERVER=1
 ENV CERT_DIR=${CERT_DIR}
 ENV CERT_KEY_NAME=${CERT_KEY_NAME}
@@ -114,7 +114,7 @@ RUN groupadd --gid ${GROUP_ID} $USER_NAME && useradd --no-log-init --uid ${USER_
 
 RUN mkdir -p $CUSTOM_DICTIONARIES_DIR \
              $USER_DICTIONARIES_DIR \
-             $PATH_TO_SERVICE_FILES_DIR/WebSpellChecker \
+             $PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker \
              /var/run/nginx
 
 COPY $FILES_DIR/$APP_NAME_MASK $DEPLOYMENT_DIR/
@@ -131,7 +131,7 @@ RUN PACKAGE_FILE=$(ls -1t $DEPLOYMENT_DIR/$APP_NAME_MASK 2>/dev/null | head -n 1
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Child-0.log && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Child-1.log && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Action.log && \
-    chown -R ${USER_ID}:${GROUP_ID} $PATH_TO_SERVICE_FILES_DIR/WebSpellChecker $DICTIONARIES_DIR $APP_SERVER_DIR
+    chown -R ${USER_ID}:${GROUP_ID} $PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker $DICTIONARIES_DIR $APP_SERVER_DIR
 
 COPY $FILES_DIR/certificate/$CERT_KEY_NAME $CERT_DIR/$CERT_KEY_NAME
 COPY $FILES_DIR/certificate/$CERT_FILE_NAME $CERT_DIR/$CERT_FILE_NAME

Dockerfile.redhat

@@ -23,7 +23,7 @@ ARG APP_ROOT_DIR=$DEPLOYMENT_DIR/WSC
 ARG APP_SERVER_DIR=/opt/WebSpellChecker/AppServer
 ARG APP_NAME_MASK=wsc_app*tar.gz
 ARG USER_NAME=wsc
-ARG PATH_TO_SERVICE_FILES_DIR=/var/lib
+ARG PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
 ARG USER_ID=2000
 ARG GROUP_ID=2000
 
@@ -68,7 +68,7 @@ ENV WEB_PORT=${WEB_PORT}
 ENV VIRTUAL_DIR=${VIRTUAL_DIR}
 ENV WEB_SERVER_TYPE=2
 ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID}
-ENV PATH_TO_SERVICE_FILES_DIR=${PATH_TO_SERVICE_FILES_DIR}
+ENV PATH_TO_SERVICE_FILES_DIRECTORY=${PATH_TO_SERVICE_FILES_DIRECTORY}
 ENV RESTART_WEB_SERVER=1
 ENV CERT_DIR=${CERT_DIR}
 ENV CERT_KEY_NAME=${CERT_KEY_NAME}
@@ -119,7 +119,7 @@ RUN groupadd --gid ${GROUP_ID} $USER_NAME && useradd --no-log-init --uid ${USER_
 
 RUN mkdir -p $CUSTOM_DICTIONARIES_DIR \
              $USER_DICTIONARIES_DIR \
-             $PATH_TO_SERVICE_FILES_DIR/WebSpellChecker \
+             $PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker \
              $APP_SERVER_DIR \
              /var/run/nginx
 
@@ -137,7 +137,7 @@ RUN PACKAGE_FILE=$(ls -1t $DEPLOYMENT_DIR/$APP_NAME_MASK 2>/dev/null | head -n 1
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Child-0.log && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Child-1.log && \
     ln -s /dev/stdout $APP_SERVER_DIR/Logs/Action.log && \
-    chown -R ${USER_ID}:${GROUP_ID} $PATH_TO_SERVICE_FILES_DIR/WebSpellChecker $DICTIONARIES_DIR $APP_SERVER_DIR
+    chown -R ${USER_ID}:${GROUP_ID} $PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker $DICTIONARIES_DIR $APP_SERVER_DIR
 
 COPY $FILES_DIR/certificate/$CERT_KEY_NAME $CERT_DIR/$CERT_KEY_NAME
 COPY $FILES_DIR/certificate/$CERT_FILE_NAME $CERT_DIR/$CERT_FILE_NAME

Dockerfile.ubuntu-prebuilt

@@ -68,13 +68,13 @@ RUN if [ -z $(egrep -i "^${USER_NAME}" /etc/group) ]; then \
         groupadd -g ${GROUP_ID} ${USER_NAME} && useradd -u ${USER_ID} -g ${GROUP_ID} ${USER_NAME};  \
     fi;
 
-RUN perl ${APP_SERVER_DIR}/install_languages.pl ${APP_SERVER_DIR}/AppServerX.xml "${AI_MODELS}" "${LANGUAGES}" "${SERVICE_FILES_DIR}/WebSpellChecker"
+RUN perl ${APP_SERVER_DIR}/install_languages.pl ${APP_SERVER_DIR}/AppServerX.xml "${AI_MODELS}" "${LANGUAGES}" "${PATH_TO_SERVICE_FILES_DIRECTORY}/WebSpellChecker"
 
 RUN if [ ! -z "${LICENSE_TICKET_ID}" ]; then \
         sh ${APP_SERVER_DIR}/activateLicense.sh ${LICENSE_TICKET_ID} -y; \
     fi;
 
-RUN chown -R ${USER_ID}:${GROUP_ID} ${SERVICE_FILES_DIR}/WebSpellChecker \
+RUN chown -R ${USER_ID}:${GROUP_ID} ${PATH_TO_SERVICE_FILES_DIRECTORY}/WebSpellChecker \
     /dictionaries \
     /opt/WebSpellChecker \
     /var/run/nginx  \

files/startService.sh

@@ -18,8 +18,8 @@ touch "${ConfigureFlag}"
 fi
 
 # activate a license automatically
-LicenseFile="${SERVICE_FILES_DIR}/WebSpellChecker/license/license.xml"
-if ! [ -f "${LicenseFile}" ] && ! [ -f "${SERVICE_FILES_DIR}/wsc/license/license.xml" ]; then
+LicenseFile="${PATH_TO_SERVICE_FILES_DIRECTORY}/WebSpellChecker/license/license.xml"
+if ! [ -f "${LicenseFile}" ] && ! [ -f "${PATH_TO_SERVICE_FILES_DIRECTORY}/wsc/license/license.xml" ]; then
    ./AppServerX -activateLicense ${LICENSE_TICKET_ID} -y
 fi