Merge branch 'development'

Author: maxim-voronko

Dockerfile

@@ -56,6 +56,9 @@ ARG PROXY_PORT
 ARG PROXY_USER_NAME
 ARG PROXY_PASSWORD
 
+# Access Key for Custom Dictionary and Style Guide API
+ARG ACCESS_KEY
+
 ENV FILE_OWNER=${USER_ID}:${GROUP_ID}
 ENV PRODUCTS=${PRODUCTS}
 ENV LANGUAGES=${LANGUAGES}
@@ -94,6 +97,8 @@ ENV ENABLE_REQUEST_STATISTIC=false
 ENV ENABLE_USER_ACTION_STATISTIC=false
 ENV ENABLE_REQUEST_VALIDATION=false
 
+ENV ACCESS_KEY=${ACCESS_KEY}
+
 RUN apt-get update && \
     apt-get upgrade -y perl && \
     apt-get install -y --no-install-recommends nginx default-jre wget && \

Dockerfile.centos

@@ -54,6 +54,9 @@ ARG PROXY_PORT
 ARG PROXY_USER_NAME
 ARG PROXY_PASSWORD
 
+# Access Key for Custom Dictionary and Style Guide API
+ARG ACCESS_KEY
+
 ENV FILE_OWNER=${USER_ID}:${GROUP_ID}
 ENV PRODUCTS=${PRODUCTS}
 ENV LANGUAGES=${LANGUAGES}
@@ -92,6 +95,8 @@ ENV ENABLE_REQUEST_STATISTIC=false
 ENV ENABLE_USER_ACTION_STATISTIC=false
 ENV ENABLE_REQUEST_VALIDATION=false
 
+ENV ACCESS_KEY=${ACCESS_KEY}
+
 RUN yum update -y --skip-broken && \
     yum install -y epel-release && \
     yum install -y nginx \

Dockerfile.redhat

@@ -54,6 +54,9 @@ ARG PROXY_PORT
 ARG PROXY_USER_NAME
 ARG PROXY_PASSWORD
 
+# Access Key for Custom Dictionary and Style Guide API
+ARG ACCESS_KEY
+
 ENV FILE_OWNER=${USER_ID}:${GROUP_ID}
 ENV PRODUCTS=${PRODUCTS}
 ENV LANGUAGES=${LANGUAGES}
@@ -92,6 +95,8 @@ ENV ENABLE_REQUEST_STATISTIC=false
 ENV ENABLE_USER_ACTION_STATISTIC=false
 ENV ENABLE_REQUEST_VALIDATION=false
 
+ENV ACCESS_KEY=${ACCESS_KEY}
+
 RUN yum update -y --skip-broken && \
     yum install -y http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && \
     yum install -y nginx \

Dockerfile.ubuntu-prebuilt

@@ -34,6 +34,9 @@ ARG PROXY_PORT
 ARG PROXY_USER_NAME
 ARG PROXY_PASSWORD
 
+# Access Key for Custom Dictionary and Style Guide API
+ARG ACCESS_KEY
+
 ENV PROTOCOL=${PROTOCOL}
 ENV DOMAIN_NAME=${DOMAIN_NAME}
 ENV WEB_PORT=${WEB_PORT}
@@ -60,6 +63,8 @@ ENV ENABLE_REQUEST_STATISTIC=false
 ENV ENABLE_USER_ACTION_STATISTIC=false
 ENV ENABLE_REQUEST_VALIDATION=false
 
+ENV ACCESS_KEY=${ACCESS_KEY}
+
 RUN apt-get update && apt-get install -y --no-install-recommends wget
 
 RUN if [ -z $(egrep -i "^${USER_NAME}" /etc/group) ]; then \

files/configureFiles.pl

@@ -10,6 +10,7 @@
 configureAppServerParams();
 configureDatabase();
 configureProxyParams();
+configureAccessKey();
 
 sub configureSamplesAndVirtualDir
 {
@@ -142,6 +143,11 @@ sub configureProxyParams
 	replaceXmlValues(\%tags, $server_config_path);
 }
 
+sub configureAccessKey()
+{
+	replaceXmlValues({ 'AccessKey' => $ENV{'ACCESS_KEY'} }, $server_config_path);
+}
+
 sub replaceFileContent
 {
 	my ($pairs, $path) = @_;