Skip to content

Commit 0ca9ddd

Browse files
maxim-voronkomaxim-voronko
authored
Merge pull request #74 from WebSpellChecker/add_namespace_to_env
Add namespace to env
2 parents b8fd162 + 3acf6d1 commit 0ca9ddd

7 files changed

Lines changed: 170 additions & 166 deletions

File tree

‎Dockerfile‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM ubuntu:24.04
33
ARG WEB_SERVER_PORT=8080
44
ARG WEB_SERVER_SSL_PORT=8443
55

6-
ENV WEB_SERVER_PORT=${WEB_SERVER_PORT}
7-
ENV WEB_SERVER_SSL_PORT=${WEB_SERVER_SSL_PORT}
6+
ENV WPR_WEB_SERVER_PORT=${WEB_SERVER_PORT}
7+
ENV WPR_WEB_SERVER_SSL_PORT=${WEB_SERVER_SSL_PORT}
88

99
EXPOSE $WEB_SERVER_PORT
1010
EXPOSE $WEB_SERVER_SSL_PORT
@@ -29,9 +29,9 @@ ARG PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
2929
ARG USER_ID=2000
3030
ARG GROUP_ID=2000
3131

32-
ENV APP_SERVER_DIR=${APP_SERVER_DIR}
32+
ENV WPR_APP_SERVER_DIR=${APP_SERVER_DIR}
3333

34-
ENV WSC_AUTO_INSTALL=TRUE
34+
ENV WPR_AUTO_INSTALL=TRUE
3535

3636
# Application installation parameters
3737
# Protocol of the NGINX web server (1 - HTTPS, 2 - HTTP)
@@ -58,48 +58,50 @@ ARG PROXY_PASSWORD
5858
# Access Key for Custom Dictionary and Style Guide API
5959
ARG ACCESS_KEY
6060

61-
ENV WPROOFREADER_CONFIG_USE_ENV=true
62-
ENV FILE_OWNER=${USER_ID}:${GROUP_ID}
63-
ENV PRODUCTS=${PRODUCTS}
64-
ENV LANGUAGES=${LANGUAGES}
65-
ENV AI_MODELS=${AI_MODELS}
66-
ENV INSTALL_SAMPLES=${INSTALL_SAMPLES}
67-
ENV PROTOCOL=${PROTOCOL}
68-
ENV DOMAIN_NAME=${DOMAIN_NAME}
69-
ENV WEB_PORT=${WEB_PORT}
70-
ENV VIRTUAL_DIR=${VIRTUAL_DIR}
71-
ENV WEB_SERVER_TYPE=2
72-
ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID}
73-
ENV PATH_TO_SERVICE_FILES_DIRECTORY=${PATH_TO_SERVICE_FILES_DIRECTORY}
74-
ENV RESTART_WEB_SERVER=1
75-
ENV CERT_DIR=${CERT_DIR}
76-
ENV CERT_KEY_NAME=${CERT_KEY_NAME}
77-
ENV CERT_FILE_NAME=${CERT_FILE_NAME}
78-
ENV DICTIONARIES_DIR=${DICTIONARIES_DIR}
79-
ENV CUSTOM_DICTIONARIES_DIR=${CUSTOM_DICTIONARIES_DIR}
80-
ENV USER_DICTIONARIES_DIR=${USER_DICTIONARIES_DIR}
81-
ENV STYLE_GUIDE_DIR=${STYLE_GUIDE_DIR}
82-
ENV SIZE=0
83-
84-
ENV ENABLE_PROXY=${ENABLE_PROXY}
85-
ENV PROXY_HOST=${PROXY_HOST}
86-
ENV PROXY_PORT=${PROXY_PORT}
87-
ENV PROXY_USER_NAME=${PROXY_USER_NAME}
88-
ENV PROXY_PASSWORD=${PROXY_PASSWORD}
61+
ENV WPR_CONFIG_USE_ENV=true
62+
ENV WPR_FILE_OWNER=${USER_ID}:${GROUP_ID}
63+
ENV WPR_PRODUCTS=${PRODUCTS}
64+
ENV WPR_LANGUAGES=${LANGUAGES}
65+
ENV WPR_AI_MODELS=${AI_MODELS}
66+
ENV WPR_INSTALL_SAMPLES=${INSTALL_SAMPLES}
67+
ENV WPR_PROTOCOL=${PROTOCOL}
68+
ENV WPR_DOMAIN_NAME=${DOMAIN_NAME}
69+
ENV WPR_WEB_PORT=${WEB_PORT}
70+
ENV WPR_VIRTUAL_DIR=${VIRTUAL_DIR}
71+
ENV WPR_WEB_SERVER_TYPE=2
72+
ENV WPR_LICENSE_TICKET_ID=${LICENSE_TICKET_ID}
73+
ENV WPR_PATH_TO_SERVICE_FILES_DIRECTORY=${PATH_TO_SERVICE_FILES_DIRECTORY}
74+
ENV WPR_RESTART_WEB_SERVER=1
75+
ENV WPR_CERT_DIR=${CERT_DIR}
76+
ENV WPR_CERT_KEY_NAME=${CERT_KEY_NAME}
77+
ENV WPR_CERT_FILE_NAME=${CERT_FILE_NAME}
78+
ENV WPR_DICTIONARIES_DIR=${DICTIONARIES_DIR}
79+
ENV WPR_CUSTOM_DICTIONARIES_DIR=${CUSTOM_DICTIONARIES_DIR}
80+
ENV WPR_USER_DICTIONARIES_DIR=${USER_DICTIONARIES_DIR}
81+
ENV WPR_STYLE_GUIDE_DIR=${STYLE_GUIDE_DIR}
82+
83+
#The log size must be set to 0 for Docker.
84+
ENV WPR_SIZE=0
85+
86+
ENV WPR_ENABLE_PROXY=${ENABLE_PROXY}
87+
ENV WPR_PROXY_HOST=${PROXY_HOST}
88+
ENV WPR_PROXY_PORT=${PROXY_PORT}
89+
ENV WPR_PROXY_USER_NAME=${PROXY_USER_NAME}
90+
ENV WPR_PROXY_PASSWORD=${PROXY_PASSWORD}
8991

9092
# Database for collecting statistics
91-
ENV ENABLE_DATABASE_PROVIDER=false
92-
ENV DATABASE_HOST=''
93-
ENV DATABASE_PORT=3306
94-
ENV DATABASE_SCHEMA=''
95-
ENV DATABASE_USER=''
96-
ENV DATABASE_PASSWORD=''
97-
ENV ENABLE_REQUEST_STATISTIC=false
98-
ENV REQUEST_STATISTIC_DATA_TYPE=DATABASE
99-
ENV ENABLE_USER_ACTION_STATISTIC=false
100-
ENV ENABLE_REQUEST_VALIDATION=false
101-
102-
ENV ACCESS_KEY=${ACCESS_KEY}
93+
ENV WPR_ENABLE_DATABASE_PROVIDER=false
94+
ENV WPR_DATABASE_HOST=''
95+
ENV WPR_DATABASE_PORT=3306
96+
ENV WPR_DATABASE_SCHEMA=''
97+
ENV WPR_DATABASE_USER=''
98+
ENV WPR_DATABASE_PASSWORD=''
99+
ENV WPR_ENABLE_REQUEST_STATISTIC=false
100+
ENV WPR_REQUEST_STATISTIC_DATA_TYPE=DATABASE
101+
ENV WPR_ENABLE_USER_ACTION_STATISTIC=false
102+
ENV WPR_ENABLE_REQUEST_VALIDATION=false
103+
104+
ENV WPR_ACCESS_KEY=${ACCESS_KEY}
103105

104106
RUN apt-get update && \
105107
apt-get upgrade -y perl && \
@@ -154,4 +156,4 @@ USER $USER_NAME
154156

155157
WORKDIR $APP_SERVER_DIR
156158

157-
ENTRYPOINT sh ${APP_SERVER_DIR}/startService.sh
159+
ENTRYPOINT ["sh", "-c", "${WPR_APP_SERVER_DIR}/startService.sh"]

‎Dockerfile.redhat‎

Lines changed: 47 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ FROM redhat/ubi9
33
ARG WEB_SERVER_PORT=8080
44
ARG WEB_SERVER_SSL_PORT=8443
55

6-
ENV WEB_SERVER_PORT=${WEB_SERVER_PORT}
7-
ENV WEB_SERVER_SSL_PORT=${WEB_SERVER_SSL_PORT}
6+
ENV WPR_WEB_SERVER_PORT=${WEB_SERVER_PORT}
7+
ENV WPR_WEB_SERVER_SSL_PORT=${WEB_SERVER_SSL_PORT}
88

99
EXPOSE $WEB_SERVER_PORT
1010
EXPOSE $WEB_SERVER_SSL_PORT
@@ -27,9 +27,9 @@ ARG PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
2727
ARG USER_ID=2000
2828
ARG GROUP_ID=2000
2929

30-
ENV APP_SERVER_DIR=${APP_SERVER_DIR}
30+
ENV WPR_APP_SERVER_DIR=${APP_SERVER_DIR}
3131

32-
ENV WSC_AUTO_INSTALL=TRUE
32+
ENV WPR_AUTO_INSTALL=TRUE
3333

3434
# Application installation parameters
3535
# Protocol of the NGINX web server (1 - HTTPS, 2 - HTTP)
@@ -56,48 +56,50 @@ ARG PROXY_PASSWORD
5656
# Access Key for Custom Dictionary and Style Guide API
5757
ARG ACCESS_KEY
5858

59-
ENV WPROOFREADER_CONFIG_USE_ENV=true
60-
ENV FILE_OWNER=${USER_ID}:${GROUP_ID}
61-
ENV PRODUCTS=${PRODUCTS}
62-
ENV LANGUAGES=${LANGUAGES}
63-
ENV AI_MODELS=${AI_MODELS}
64-
ENV INSTALL_SAMPLES=${INSTALL_SAMPLES}
65-
ENV PROTOCOL=${PROTOCOL}
66-
ENV DOMAIN_NAME=${DOMAIN_NAME}
67-
ENV WEB_PORT=${WEB_PORT}
68-
ENV VIRTUAL_DIR=${VIRTUAL_DIR}
69-
ENV WEB_SERVER_TYPE=2
70-
ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID}
71-
ENV PATH_TO_SERVICE_FILES_DIRECTORY=${PATH_TO_SERVICE_FILES_DIRECTORY}
72-
ENV RESTART_WEB_SERVER=1
73-
ENV CERT_DIR=${CERT_DIR}
74-
ENV CERT_KEY_NAME=${CERT_KEY_NAME}
75-
ENV CERT_FILE_NAME=${CERT_FILE_NAME}
76-
ENV DICTIONARIES_DIR=${DICTIONARIES_DIR}
77-
ENV CUSTOM_DICTIONARIES_DIR=${CUSTOM_DICTIONARIES_DIR}
78-
ENV USER_DICTIONARIES_DIR=${USER_DICTIONARIES_DIR}
79-
ENV STYLE_GUIDE_DIR=${STYLE_GUIDE_DIR}
80-
ENV SIZE=0
81-
82-
ENV ENABLE_PROXY=${ENABLE_PROXY}
83-
ENV PROXY_HOST=${PROXY_HOST}
84-
ENV PROXY_PORT=${PROXY_PORT}
85-
ENV PROXY_USER_NAME=${PROXY_USER_NAME}
86-
ENV PROXY_PASSWORD=${PROXY_PASSWORD}
59+
ENV WPR_CONFIG_USE_ENV=true
60+
ENV WPR_FILE_OWNER=${USER_ID}:${GROUP_ID}
61+
ENV WPR_PRODUCTS=${PRODUCTS}
62+
ENV WPR_LANGUAGES=${LANGUAGES}
63+
ENV WPR_AI_MODELS=${AI_MODELS}
64+
ENV WPR_INSTALL_SAMPLES=${INSTALL_SAMPLES}
65+
ENV WPR_PROTOCOL=${PROTOCOL}
66+
ENV WPR_DOMAIN_NAME=${DOMAIN_NAME}
67+
ENV WPR_WEB_PORT=${WEB_PORT}
68+
ENV WPR_VIRTUAL_DIR=${VIRTUAL_DIR}
69+
ENV WPR_WEB_SERVER_TYPE=2
70+
ENV WPR_LICENSE_TICKET_ID=${LICENSE_TICKET_ID}
71+
ENV WPR_PATH_TO_SERVICE_FILES_DIRECTORY=${PATH_TO_SERVICE_FILES_DIRECTORY}
72+
ENV WPR_RESTART_WEB_SERVER=1
73+
ENV WPR_CERT_DIR=${CERT_DIR}
74+
ENV WPR_CERT_KEY_NAME=${CERT_KEY_NAME}
75+
ENV WPR_CERT_FILE_NAME=${CERT_FILE_NAME}
76+
ENV WPR_DICTIONARIES_DIR=${DICTIONARIES_DIR}
77+
ENV WPR_CUSTOM_DICTIONARIES_DIR=${CUSTOM_DICTIONARIES_DIR}
78+
ENV WPR_USER_DICTIONARIES_DIR=${USER_DICTIONARIES_DIR}
79+
ENV WPR_STYLE_GUIDE_DIR=${STYLE_GUIDE_DIR}
80+
81+
#The log size must be set to 0 for Docker.
82+
ENV WPR_SIZE=0
83+
84+
ENV WPR_ENABLE_PROXY=${ENABLE_PROXY}
85+
ENV WPR_PROXY_HOST=${PROXY_HOST}
86+
ENV WPR_PROXY_PORT=${PROXY_PORT}
87+
ENV WPR_PROXY_USER_NAME=${PROXY_USER_NAME}
88+
ENV WPR_PROXY_PASSWORD=${PROXY_PASSWORD}
8789

8890
# Database for collecting statistics
89-
ENV ENABLE_DATABASE_PROVIDER=false
90-
ENV DATABASE_HOST=''
91-
ENV DATABASE_PORT=3306
92-
ENV DATABASE_SCHEMA=''
93-
ENV DATABASE_USER=''
94-
ENV DATABASE_PASSWORD=''
95-
ENV ENABLE_REQUEST_STATISTIC=false
96-
ENV REQUEST_STATISTIC_DATA_TYPE=DATABASE
97-
ENV ENABLE_USER_ACTION_STATISTIC=false
98-
ENV ENABLE_REQUEST_VALIDATION=false
99-
100-
ENV ACCESS_KEY=${ACCESS_KEY}
91+
ENV WPR_ENABLE_DATABASE_PROVIDER=false
92+
ENV WPR_DATABASE_HOST=''
93+
ENV WPR_DATABASE_PORT=3306
94+
ENV WPR_DATABASE_SCHEMA=''
95+
ENV WPR_DATABASE_USER=''
96+
ENV WPR_DATABASE_PASSWORD=''
97+
ENV WPR_ENABLE_REQUEST_STATISTIC=false
98+
ENV WPR_REQUEST_STATISTIC_DATA_TYPE=DATABASE
99+
ENV WPR_ENABLE_USER_ACTION_STATISTIC=false
100+
ENV WPR_ENABLE_REQUEST_VALIDATION=false
101+
102+
ENV WPR_ACCESS_KEY=${ACCESS_KEY}
101103

102104
RUN yum update -y --skip-broken && \
103105
yum module enable nginx:1.24 -y && \
@@ -163,4 +165,4 @@ USER $USER_NAME
163165

164166
WORKDIR $APP_SERVER_DIR
165167

166-
ENTRYPOINT sh ${APP_SERVER_DIR}/startService.sh
168+
ENTRYPOINT ["sh", "-c", "${WPR_APP_SERVER_DIR}/startService.sh"]

‎Dockerfile.ubuntu-prebuilt‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -35,46 +35,46 @@ ARG PROXY_PASSWORD
3535
# Access Key for Custom Dictionary and Style Guide API
3636
ARG ACCESS_KEY
3737

38-
ENV PROTOCOL=${PROTOCOL}
39-
ENV DOMAIN_NAME=${DOMAIN_NAME}
40-
ENV WEB_PORT=${WEB_PORT}
41-
ENV VIRTUAL_DIR=${VIRTUAL_DIR}
42-
ENV WEB_SERVER_TYPE=2
43-
ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID}
44-
ENV RESTART_WEB_SERVER=1
45-
46-
ENV ENABLE_PROXY=${ENABLE_PROXY}
47-
ENV PROXY_HOST=${PROXY_HOST}
48-
ENV PROXY_PORT=${PROXY_PORT}
49-
ENV PROXY_USER_NAME=${PROXY_USER_NAME}
50-
ENV PROXY_PASSWORD=${PROXY_PASSWORD}
38+
ENV WPR_PROTOCOL=${PROTOCOL}
39+
ENV WPR_DOMAIN_NAME=${DOMAIN_NAME}
40+
ENV WPR_WEB_PORT=${WEB_PORT}
41+
ENV WPR_VIRTUAL_DIR=${VIRTUAL_DIR}
42+
ENV WPR_WEB_SERVER_TYPE=2
43+
ENV WPR_LICENSE_TICKET_ID=${LICENSE_TICKET_ID}
44+
ENV WPR_RESTART_WEB_SERVER=1
45+
46+
ENV WPR_ENABLE_PROXY=${ENABLE_PROXY}
47+
ENV WPR_PROXY_HOST=${PROXY_HOST}
48+
ENV WPR_PROXY_PORT=${PROXY_PORT}
49+
ENV WPR_PROXY_USER_NAME=${PROXY_USER_NAME}
50+
ENV WPR_PROXY_PASSWORD=${PROXY_PASSWORD}
5151

5252
# Database for collecting statistics
53-
ENV ENABLE_DATABASE_PROVIDER=false
54-
ENV DATABASE_HOST=''
55-
ENV DATABASE_PORT=3306
56-
ENV DATABASE_SCHEMA=''
57-
ENV DATABASE_USER=''
58-
ENV DATABASE_PASSWORD=''
59-
ENV ENABLE_REQUEST_STATISTIC=false
60-
ENV ENABLE_USER_ACTION_STATISTIC=false
61-
ENV ENABLE_REQUEST_VALIDATION=false
62-
63-
ENV ACCESS_KEY=${ACCESS_KEY}
53+
ENV WPR_ENABLE_DATABASE_PROVIDER=false
54+
ENV WPR_DATABASE_HOST=''
55+
ENV WPR_DATABASE_PORT=3306
56+
ENV WPR_DATABASE_SCHEMA=''
57+
ENV WPR_DATABASE_USER=''
58+
ENV WPR_DATABASE_PASSWORD=''
59+
ENV WPR_ENABLE_REQUEST_STATISTIC=false
60+
ENV WPR_ENABLE_USER_ACTION_STATISTIC=false
61+
ENV WPR_ENABLE_REQUEST_VALIDATION=false
62+
63+
ENV WPR_ACCESS_KEY=${ACCESS_KEY}
6464

6565
RUN apt-get update && apt-get install -y --no-install-recommends wget
6666

6767
RUN if [ -z $(egrep -i "^${USER_NAME}" /etc/group) ]; then \
6868
groupadd -g ${GROUP_ID} ${USER_NAME} && useradd -u ${USER_ID} -g ${GROUP_ID} ${USER_NAME}; \
6969
fi;
7070

71-
RUN perl ${APP_SERVER_DIR}/install_languages.pl ${APP_SERVER_DIR}/AppServerX.xml "${AI_MODELS}" "${LANGUAGES}" "${PATH_TO_SERVICE_FILES_DIRECTORY}/WebSpellChecker"
71+
RUN perl ${WPR_APP_SERVER_DIR}/install_languages.pl ${WPR_APP_SERVER_DIR}/AppServerX.xml "${AI_MODELS}" "${LANGUAGES}" "${WPR_PATH_TO_SERVICE_FILES_DIRECTORY}/WebSpellChecker"
7272

73-
RUN if [ ! -z "${LICENSE_TICKET_ID}" ]; then \
74-
sh ${APP_SERVER_DIR}/activateLicense.sh ${LICENSE_TICKET_ID} -y; \
73+
RUN if [ ! -z "${WPR_LICENSE_TICKET_ID}" ]; then \
74+
sh ${WPR_APP_SERVER_DIR}/activateLicense.sh ${WPR_LICENSE_TICKET_ID} -y; \
7575
fi;
7676

77-
RUN chown -R ${USER_ID}:${GROUP_ID} ${PATH_TO_SERVICE_FILES_DIRECTORY}/WebSpellChecker \
77+
RUN chown -R ${USER_ID}:${GROUP_ID} ${WPR_PATH_TO_SERVICE_FILES_DIRECTORY}/WebSpellChecker \
7878
/dictionaries \
7979
/opt/WebSpellChecker \
8080
/var/run/nginx \
@@ -87,6 +87,6 @@ RUN apt-get remove -y wget && apt-get autoremove -y && apt-get clean
8787

8888
USER $USER_NAME
8989

90-
WORKDIR $APP_SERVER_DIR
90+
WORKDIR $WPR_APP_SERVER_DIR
9191

92-
ENTRYPOINT sh ${APP_SERVER_DIR}/startService.sh
92+
ENTRYPOINT ["sh", "-c", "${WPR_APP_SERVER_DIR}/startService.sh"]

0 commit comments

Comments
 (0)