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 SERVICE_FILES_DIR=/var/lib
+ARG PATH_TO_SERVICE_FILES_DIR=/var/lib
 ARG USER_ID=2000
 ARG GROUP_ID=2000
 
@@ -58,6 +58,7 @@ ARG PROXY_PASSWORD
 # Access Key for Custom Dictionary and Style Guide API
 ARG ACCESS_KEY
 
+ENV WPROOFREADER_CONFIG_USE_ENV=true
 ENV FILE_OWNER=${USER_ID}:${GROUP_ID}
 ENV PRODUCTS=${PRODUCTS}
 ENV LANGUAGES=${LANGUAGES}
@@ -69,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 SERVICE_FILES_DIR=${SERVICE_FILES_DIR}
+ENV PATH_TO_SERVICE_FILES_DIR=${PATH_TO_SERVICE_FILES_DIR}
 ENV RESTART_WEB_SERVER=1
 ENV CERT_DIR=${CERT_DIR}
 ENV CERT_KEY_NAME=${CERT_KEY_NAME}
@@ -78,6 +79,7 @@ ENV DICTIONARIES_DIR=${DICTIONARIES_DIR}
 ENV CUSTOM_DICTIONARIES_DIR=${CUSTOM_DICTIONARIES_DIR}
 ENV USER_DICTIONARIES_DIR=${USER_DICTIONARIES_DIR}
 ENV STYLE_GUIDE_DIR=${STYLE_GUIDE_DIR}
+ENV SIZE=0
 
 ENV ENABLE_PROXY=${ENABLE_PROXY}
 ENV PROXY_HOST=${PROXY_HOST}
@@ -86,13 +88,14 @@ ENV PROXY_USER_NAME=${PROXY_USER_NAME}
 ENV PROXY_PASSWORD=${PROXY_PASSWORD}
 
 # Database for collecting statistics
-ENV ENABLE_DATABASE=false
+ENV ENABLE_DATABASE_PROVIDER=false
 ENV DATABASE_HOST=''
 ENV DATABASE_PORT=3306
 ENV DATABASE_SCHEMA=''
 ENV DATABASE_USER=''
 ENV DATABASE_PASSWORD=''
 ENV ENABLE_REQUEST_STATISTIC=false
+ENV REQUEST_STATISTIC_DATA_TYPE=DATABASE
 ENV ENABLE_USER_ACTION_STATISTIC=false
 ENV ENABLE_REQUEST_VALIDATION=false
 
@@ -111,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 \
-             $SERVICE_FILES_DIR/WebSpellChecker \
+             $PATH_TO_SERVICE_FILES_DIR/WebSpellChecker \
              /var/run/nginx
 
 COPY $FILES_DIR/$APP_NAME_MASK $DEPLOYMENT_DIR/
@@ -128,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} $SERVICE_FILES_DIR/WebSpellChecker $DICTIONARIES_DIR $APP_SERVER_DIR
+    chown -R ${USER_ID}:${GROUP_ID} $PATH_TO_SERVICE_FILES_DIR/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 SERVICE_FILES_DIR=/var/lib
+ARG PATH_TO_SERVICE_FILES_DIR=/var/lib
 ARG USER_ID=2000
 ARG GROUP_ID=2000
 
@@ -56,6 +56,7 @@ ARG PROXY_PASSWORD
 # Access Key for Custom Dictionary and Style Guide API
 ARG ACCESS_KEY
 
+ENV WPROOFREADER_CONFIG_USE_ENV=true
 ENV FILE_OWNER=${USER_ID}:${GROUP_ID}
 ENV PRODUCTS=${PRODUCTS}
 ENV LANGUAGES=${LANGUAGES}
@@ -67,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 SERVICE_FILES_DIR=${SERVICE_FILES_DIR}
+ENV PATH_TO_SERVICE_FILES_DIR=${PATH_TO_SERVICE_FILES_DIR}
 ENV RESTART_WEB_SERVER=1
 ENV CERT_DIR=${CERT_DIR}
 ENV CERT_KEY_NAME=${CERT_KEY_NAME}
@@ -76,6 +77,7 @@ ENV DICTIONARIES_DIR=${DICTIONARIES_DIR}
 ENV CUSTOM_DICTIONARIES_DIR=${CUSTOM_DICTIONARIES_DIR}
 ENV USER_DICTIONARIES_DIR=${USER_DICTIONARIES_DIR}
 ENV STYLE_GUIDE_DIR=${STYLE_GUIDE_DIR}
+ENV SIZE=0
 
 ENV ENABLE_PROXY=${ENABLE_PROXY}
 ENV PROXY_HOST=${PROXY_HOST}
@@ -84,13 +86,14 @@ ENV PROXY_USER_NAME=${PROXY_USER_NAME}
 ENV PROXY_PASSWORD=${PROXY_PASSWORD}
 
 # Database for collecting statistics
-ENV ENABLE_DATABASE=false
+ENV ENABLE_DATABASE_PROVIDER=false
 ENV DATABASE_HOST=''
 ENV DATABASE_PORT=3306
 ENV DATABASE_SCHEMA=''
 ENV DATABASE_USER=''
 ENV DATABASE_PASSWORD=''
 ENV ENABLE_REQUEST_STATISTIC=false
+ENV REQUEST_STATISTIC_DATA_TYPE=DATABASE
 ENV ENABLE_USER_ACTION_STATISTIC=false
 ENV ENABLE_REQUEST_VALIDATION=false
 
@@ -116,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 \
-             $SERVICE_FILES_DIR/WebSpellChecker \
+             $PATH_TO_SERVICE_FILES_DIR/WebSpellChecker \
              $APP_SERVER_DIR \
              /var/run/nginx
 
@@ -134,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} $SERVICE_FILES_DIR/WebSpellChecker $DICTIONARIES_DIR $APP_SERVER_DIR
+    chown -R ${USER_ID}:${GROUP_ID} $PATH_TO_SERVICE_FILES_DIR/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

@@ -50,7 +50,7 @@ ENV PROXY_USER_NAME=${PROXY_USER_NAME}
 ENV PROXY_PASSWORD=${PROXY_PASSWORD}
 
 # Database for collecting statistics
-ENV ENABLE_DATABASE=false
+ENV ENABLE_DATABASE_PROVIDER=false
 ENV DATABASE_HOST=''
 ENV DATABASE_PORT=3306
 ENV DATABASE_SCHEMA=''

README.md

@@ -172,6 +172,10 @@ where:
 * `--env VIRTUAL_DIR=wscservice` start a container with `wscservice` as virtual dir
 * `--env LICENSE_TICKET_ID=6u*************ZO` activate license on container start with `6u*************ZO` license ticket id
 
+Additional parameters:
+
+* `--env JVM_MAX_MEMORY_SIZE_MB=2048` in case of errors related to Java heap space, we recommend increasing the default JVM heap size to 2048 MB.
+
 The container launched by the command above will be available at the following address:
 
 ```

files/configureFiles.pl

@@ -6,11 +6,6 @@
 
 configureSamplesAndVirtualDir();
 configureUserAndCustomDictionaries();
-configureSsl();
-configureAppServerParams();
-configureDatabase();
-configureProxyParams();
-configureAccessKey();
 
 sub configureSamplesAndVirtualDir
 {
@@ -109,54 +104,6 @@ sub configureUserAndCustomDictionaries
 	}
 }
 
-sub configureSsl
-{
-	replaceXmlValues({ 'VerificationMode' => 'NONE' }, $server_config_path);
-}
-
-sub configureAppServerParams
-{
-	replaceXmlValues({ 'Size' => '0' }, $server_config_path);
-	if (replaceXmlValues({ 'PathToServiceFilesDirectory' => "$ENV{'SERVICE_FILES_DIR'}" }, $server_config_path) == 0)
-	{
-		replaceFileContent({ '</ServiceName>' => "</ServiceName>\n	<PathToServiceFilesDirectory>$ENV{'SERVICE_FILES_DIR'}</PathToServiceFilesDirectory>" }, $server_config_path);
-	}
-}
-
-sub configureDatabase
-{
-	my %tags = (
-		'EnableRequestStatistic' => $ENV{'ENABLE_REQUEST_STATISTIC'},
-		'RequestStatisticDataType' => 'DATABASE',
-		'EnableRequestValidation' => $ENV{'ENABLE_REQUEST_VALIDATION'},
-		'EnableUserActionStatistic' => $ENV{'ENABLE_USER_ACTION_STATISTIC'},
-		'EnableDatabaseProvider' => $ENV{'ENABLE_DATABASE'},
-		'DatabaseHost' => $ENV{'DATABASE_HOST'},
-		'DatabasePort' => $ENV{'DATABASE_PORT'},
-		'DatabaseSchema' => $ENV{'DATABASE_SCHEMA'},
-		'DatabaseUser' => $ENV{'DATABASE_USER'},
-		'DatabasePassword' => $ENV{'DATABASE_PASSWORD'}
-	);
-	replaceXmlValues(\%tags, $server_config_path);
-}
-
-sub configureProxyParams
-{
-	my %tags = (
-		'EnableProxy' => $ENV{'ENABLE_PROXY'},
-		'ProxyHost' => $ENV{'PROXY_HOST'},
-		'ProxyPort' => $ENV{'PROXY_PORT'},
-		'ProxyUserName' => $ENV{'PROXY_USER_NAME'},
-		'ProxyPassword' => $ENV{'PROXY_PASSWORD'}
-	);
-	replaceXmlValues(\%tags, $server_config_path);
-}
-
-sub configureAccessKey()
-{
-	replaceXmlValues({ 'AccessKey' => $ENV{'ACCESS_KEY'} }, $server_config_path);
-}
-
 sub replaceFileContent
 {
 	my ($pairs, $path) = @_;