Skip to content

Commit f0eef57

Browse files
KharchenkoMaksKharchenkoMaks
committed
Merge branch 'development'
2 parents 4c4c268 + 75647cf commit f0eef57

File tree

5 files changed

+282
-139
lines changed

5 files changed

+282
-139
lines changed

‎Dockerfile‎

Lines changed: 76 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
1-
FROM ubuntu:24.04
1+
FROM ubuntu:24.04 AS wpr_dependencies
22

3-
ARG WPR_WEB_SERVER_PORT=8080
4-
ARG WPR_WEB_SERVER_SSL_PORT=8443
5-
6-
ENV WPR_WEB_SERVER_PORT=${WPR_WEB_SERVER_PORT}
7-
ENV WPR_WEB_SERVER_SSL_PORT=${WPR_WEB_SERVER_SSL_PORT}
3+
USER root
84

9-
EXPOSE $WPR_WEB_SERVER_PORT
10-
EXPOSE $WPR_WEB_SERVER_SSL_PORT
11-
EXPOSE 2880
12-
13-
ENV DEBIAN_FRONTEND=noninteractive
5+
RUN apt-get update && \
6+
apt-get upgrade -y perl && \
7+
apt-get install -y --no-install-recommends nginx default-jre && \
8+
apt-get clean && \
9+
rm -rf /var/lib/apt/lists/* && \
10+
rm -rf /etc/nginx/sites-enabled/default /var/www/html/* && \
11+
rm -rf /var/log/nginx/* && \
12+
ln -sf /dev/stderr /var/log/nginx/error.log
1413

1514
ARG WPR_FILES_DIR=./files
16-
ARG WPR_DEPLOYMENT_DIR=/home
1715
ARG WPR_DICTIONARIES_DIR=/dictionaries
1816
ARG WPR_CUSTOM_DICTIONARIES_DIR=$WPR_DICTIONARIES_DIR/CustomDictionaries
1917
ARG WPR_USER_DICTIONARIES_DIR=$WPR_DICTIONARIES_DIR/UserDictionaries
2018
ARG WPR_STYLE_GUIDE_DIR=$WPR_DICTIONARIES_DIR/StyleGuide
2119
ARG WPR_CERT_DIR=/certificate
2220
ARG WPR_CERT_KEY_NAME=key.pem
2321
ARG WPR_CERT_FILE_NAME=cert.pem
24-
ARG WPR_APP_ROOT_DIR=$WPR_DEPLOYMENT_DIR/WSC
25-
ARG WPR_APP_SERVER_DIR=/opt/WebSpellChecker/AppServer
26-
ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
27-
ARG WPR_USER_NAME=wsc
22+
ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
23+
ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
2824
ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
25+
ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
2926
ARG WPR_USER_ID=2000
3027
ARG WPR_GROUP_ID=2000
28+
ARG WPR_USER_NAME=wsc
3129

3230
ENV WPR_APP_SERVER_DIR=${WPR_APP_SERVER_DIR}
3331

34-
ENV WPR_AUTO_INSTALL=TRUE
35-
3632
# Application installation parameters
3733
# Protocol of the NGINX web server (1 - HTTPS, 2 - HTTP)
3834
ARG WPR_PROTOCOL=2
@@ -42,10 +38,6 @@ ARG WPR_DOMAIN_NAME=localhost
4238
ARG WPR_VIRTUAL_DIR=wscservice
4339
# Specify license ticket ID to activate the license during the image build. For example, WPR_LICENSE_TICKET_ID = 6u*************ZO
4440
ARG WPR_LICENSE_TICKET_ID
45-
ARG WPR_PRODUCTS=4
46-
ARG WPR_LANGUAGES=en_US,en_GB,en_CA,en_AU
47-
ARG WPR_AI_MODELS=1,2
48-
ARG WPR_INSTALL_SAMPLES=1
4941

5042
# Proxy server settings
5143
# If you are using a proxy server to handle inbound/outbound traffic to your network, for the automated license activation step, the following proxy settings must be added.
@@ -60,17 +52,14 @@ ARG WPR_ACCESS_KEY
6052

6153
ENV WPR_CONFIG_USE_ENV=true
6254
ENV WPR_FILE_OWNER=${WPR_USER_ID}:${WPR_GROUP_ID}
63-
ENV WPR_PRODUCTS=${WPR_PRODUCTS}
64-
ENV WPR_LANGUAGES=${WPR_LANGUAGES}
65-
ENV WPR_AI_MODELS=${WPR_AI_MODELS}
66-
ENV WPR_INSTALL_SAMPLES=${WPR_INSTALL_SAMPLES}
6755
ENV WPR_PROTOCOL=${WPR_PROTOCOL}
6856
ENV WPR_DOMAIN_NAME=${WPR_DOMAIN_NAME}
6957
ENV WPR_WEB_PORT=${WPR_WEB_PORT}
7058
ENV WPR_VIRTUAL_DIR=${WPR_VIRTUAL_DIR}
7159
ENV WPR_WEB_SERVER_TYPE=2
7260
ENV WPR_LICENSE_TICKET_ID=${WPR_LICENSE_TICKET_ID}
7361
ENV WPR_PATH_TO_SERVICE_FILES_DIRECTORY=${WPR_PATH_TO_SERVICE_FILES_DIRECTORY}
62+
ENV WPR_WSC_SERVICE_FILES_PATH=${WPR_WSC_SERVICE_FILES_PATH}
7463
ENV WPR_RESTART_WEB_SERVER=1
7564
ENV WPR_CERT_DIR=${WPR_CERT_DIR}
7665
ENV WPR_CERT_KEY_NAME=${WPR_CERT_KEY_NAME}
@@ -103,20 +92,38 @@ ENV WPR_ENABLE_REQUEST_VALIDATION=false
10392

10493
ENV WPR_ACCESS_KEY=${WPR_ACCESS_KEY}
10594

106-
RUN apt-get update && \
107-
apt-get upgrade -y perl && \
108-
apt-get install -y --no-install-recommends nginx default-jre wget && \
109-
apt-get clean && \
110-
rm -rf /var/lib/apt/lists/* && \
111-
rm -rf /etc/nginx/sites-enabled/default /var/www/html/* && \
112-
rm -rf /var/log/nginx/* && \
113-
ln -sf /dev/stderr /var/log/nginx/error.log
114-
11595
RUN groupadd --gid ${WPR_GROUP_ID} $WPR_USER_NAME && useradd --no-log-init --uid ${WPR_USER_ID} --gid ${WPR_GROUP_ID} $WPR_USER_NAME
11696

97+
98+
FROM wpr_dependencies AS wpr_installer
99+
100+
RUN apt-get update && apt-get install -y --no-install-recommends wget
101+
102+
ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
103+
ARG WPR_DEPLOYMENT_DIR=/home
104+
ARG WPR_APP_ROOT_DIR=$WPR_DEPLOYMENT_DIR/WSC
105+
106+
# Comma-separated list of language IDs to install
107+
ARG WPR_LANGUAGES=en_US,en_GB,en_CA,en_AU
108+
# List of AI models to install:
109+
# 1. English language model
110+
# 2. English autocomplete model
111+
# 3. German language model
112+
# 4. Spanish language model
113+
ARG WPR_AI_MODELS=1,2
114+
ARG WPR_PRODUCTS=4
115+
ARG WPR_INSTALL_SAMPLES=1
116+
117+
ENV WPR_LANGUAGES=${WPR_LANGUAGES}
118+
ENV WPR_AI_MODELS=${WPR_AI_MODELS}
119+
ENV WPR_PRODUCTS=${WPR_PRODUCTS}
120+
ENV WPR_INSTALL_SAMPLES=${WPR_INSTALL_SAMPLES}
121+
122+
ENV WPR_AUTO_INSTALL=TRUE
123+
117124
RUN mkdir -p $WPR_CUSTOM_DICTIONARIES_DIR \
118125
$WPR_USER_DICTIONARIES_DIR \
119-
$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker \
126+
$WPR_WSC_SERVICE_FILES_PATH \
120127
/var/run/nginx
121128

122129
COPY $WPR_FILES_DIR/$WPR_APP_NAME_MASK $WPR_DEPLOYMENT_DIR/
@@ -133,25 +140,44 @@ RUN PACKAGE_FILE=$(ls -1t $WPR_DEPLOYMENT_DIR/$WPR_APP_NAME_MASK 2>/dev/null | h
133140
ln -s /dev/stdout $WPR_APP_SERVER_DIR/Logs/Child-0.log && \
134141
ln -s /dev/stdout $WPR_APP_SERVER_DIR/Logs/Child-1.log && \
135142
ln -s /dev/stdout $WPR_APP_SERVER_DIR/Logs/Action.log && \
136-
chown -R ${WPR_USER_ID}:${WPR_GROUP_ID} $WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker $WPR_DICTIONARIES_DIR $WPR_APP_SERVER_DIR
137-
138-
COPY $WPR_FILES_DIR/certificate/$WPR_CERT_KEY_NAME $WPR_CERT_DIR/$WPR_CERT_KEY_NAME
139-
COPY $WPR_FILES_DIR/certificate/$WPR_CERT_FILE_NAME $WPR_CERT_DIR/$WPR_CERT_FILE_NAME
140-
COPY $WPR_FILES_DIR/configure* $WPR_APP_SERVER_DIR/
141-
COPY $WPR_FILES_DIR/startService.sh $WPR_APP_SERVER_DIR
142-
RUN chown ${WPR_USER_ID}:${WPR_GROUP_ID} $WPR_APP_SERVER_DIR/startService.sh && \
143-
chown ${WPR_USER_ID}:${WPR_GROUP_ID} $WPR_APP_SERVER_DIR/configureFiles.pl && \
144-
chown ${WPR_USER_ID}:${WPR_GROUP_ID} $WPR_APP_SERVER_DIR/configureWebServer.pl && \
145-
chmod +x $WPR_APP_SERVER_DIR/startService.sh
146-
147-
RUN chown -R ${WPR_USER_ID}:${WPR_GROUP_ID} /var/log/nginx \
143+
chown -R ${WPR_FILE_OWNER} $WPR_WSC_SERVICE_FILES_PATH $WPR_DICTIONARIES_DIR $WPR_APP_INSTALL_DIR
144+
145+
146+
FROM wpr_dependencies AS wpr_service
147+
148+
ARG WPR_WEB_SERVER_PORT=8080
149+
ARG WPR_WEB_SERVER_SSL_PORT=8443
150+
151+
ENV WPR_WEB_SERVER_PORT=${WPR_WEB_SERVER_PORT}
152+
ENV WPR_WEB_SERVER_SSL_PORT=${WPR_WEB_SERVER_SSL_PORT}
153+
154+
EXPOSE $WPR_WEB_SERVER_PORT
155+
EXPOSE $WPR_WEB_SERVER_SSL_PORT
156+
EXPOSE 2880
157+
158+
ENV DEBIAN_FRONTEND=noninteractive
159+
160+
RUN mkdir -p /var/run/nginx && chown -R ${WPR_FILE_OWNER} /var/run/nginx
161+
162+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_APP_INSTALL_DIR $WPR_APP_INSTALL_DIR
163+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_WSC_SERVICE_FILES_PATH $WPR_WSC_SERVICE_FILES_PATH
164+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_DICTIONARIES_DIR $WPR_DICTIONARIES_DIR
165+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
166+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
167+
168+
COPY --chown=${WPR_FILE_OWNER} $WPR_FILES_DIR/certificate/$WPR_CERT_KEY_NAME $WPR_CERT_DIR/$WPR_CERT_KEY_NAME
169+
COPY --chown=${WPR_FILE_OWNER} $WPR_FILES_DIR/certificate/$WPR_CERT_FILE_NAME $WPR_CERT_DIR/$WPR_CERT_FILE_NAME
170+
COPY --chown=${WPR_FILE_OWNER} $WPR_FILES_DIR/configure* $WPR_APP_SERVER_DIR/
171+
COPY --chown=${WPR_FILE_OWNER} $WPR_FILES_DIR/startService.sh $WPR_APP_SERVER_DIR
172+
173+
RUN chmod +x $WPR_APP_SERVER_DIR/startService.sh
174+
175+
RUN chown -R ${WPR_FILE_OWNER} /var/log/nginx \
148176
/usr/sbin/nginx \
149177
/var/lib/nginx \
150178
/var/run/nginx \
151179
/etc/nginx
152180

153-
RUN apt-get remove -y wget && apt-get autoremove -y
154-
155181
USER $WPR_USER_NAME
156182

157183
WORKDIR $WPR_APP_SERVER_DIR

‎Dockerfile.redhat‎

Lines changed: 82 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
1-
FROM redhat/ubi9
1+
FROM redhat/ubi9 AS wpr_dependencies
22

3-
ARG WPR_WEB_SERVER_PORT=8080
4-
ARG WPR_WEB_SERVER_SSL_PORT=8443
5-
6-
ENV WPR_WEB_SERVER_PORT=${WPR_WEB_SERVER_PORT}
7-
ENV WPR_WEB_SERVER_SSL_PORT=${WPR_WEB_SERVER_SSL_PORT}
3+
USER root
84

9-
EXPOSE $WPR_WEB_SERVER_PORT
10-
EXPOSE $WPR_WEB_SERVER_SSL_PORT
11-
EXPOSE 2880
5+
RUN yum update -y --skip-broken && \
6+
yum module enable nginx:1.24 -y && \
7+
yum install -y nginx \
8+
java-17-openjdk-devel \
9+
perl && \
10+
yum remove -y webkit2gtk3-jsc \
11+
python-setuptools \
12+
python-urllib3 \
13+
python-idna \
14+
python-requests && \
15+
yum clean all && rm -rf /var/cache/yum && \
16+
rm -rf /etc/nginx/conf.d/default.conf /usr/share/nginx/html/* && \
17+
rm -rf /var/log/nginx/* && \
18+
ln -sf /dev/stderr /var/log/nginx/error.log
1219

1320
ARG WPR_FILES_DIR=./files
14-
ARG WPR_DEPLOYMENT_DIR=/home
1521
ARG WPR_DICTIONARIES_DIR=/dictionaries
1622
ARG WPR_CUSTOM_DICTIONARIES_DIR=$WPR_DICTIONARIES_DIR/CustomDictionaries
1723
ARG WPR_USER_DICTIONARIES_DIR=$WPR_DICTIONARIES_DIR/UserDictionaries
1824
ARG WPR_STYLE_GUIDE_DIR=$WPR_DICTIONARIES_DIR/StyleGuide
1925
ARG WPR_CERT_DIR=/certificate
2026
ARG WPR_CERT_KEY_NAME=key.pem
2127
ARG WPR_CERT_FILE_NAME=cert.pem
22-
ARG WPR_APP_ROOT_DIR=$WPR_DEPLOYMENT_DIR/WSC
23-
ARG WPR_APP_SERVER_DIR=/opt/WebSpellChecker/AppServer
24-
ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
25-
ARG WPR_USER_NAME=wsc
28+
ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
29+
ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
2630
ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
31+
ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
2732
ARG WPR_USER_ID=2000
2833
ARG WPR_GROUP_ID=2000
34+
ARG WPR_USER_NAME=wsc
2935

3036
ENV WPR_APP_SERVER_DIR=${WPR_APP_SERVER_DIR}
3137

32-
ENV WPR_AUTO_INSTALL=TRUE
33-
3438
# Application installation parameters
3539
# Protocol of the NGINX web server (1 - HTTPS, 2 - HTTP)
3640
ARG WPR_PROTOCOL=2
3741
# Web port outside the container. If value isn't specified (e.g. empty), the default value will be used (443 for HTTPS and 80 for HTTP).
3842
ARG WPR_WEB_PORT
3943
ARG WPR_DOMAIN_NAME=localhost
4044
ARG WPR_VIRTUAL_DIR=wscservice
41-
# Specify license ticket ID to activate the license during the image build. For example, LICENSE_TICKET_ID = 6u*************ZO
45+
# Specify license ticket ID to activate the license during the image build. For example, WPR_LICENSE_TICKET_ID = 6u*************ZO
4246
ARG WPR_LICENSE_TICKET_ID
43-
ARG WPR_PRODUCTS=4
44-
ARG WPR_LANGUAGES=en_US,en_GB,en_CA,en_AU
45-
ARG WPR_AI_MODELS=1,2
46-
ARG WPR_INSTALL_SAMPLES=1
4747

4848
# Proxy server settings
4949
# If you are using a proxy server to handle inbound/outbound traffic to your network, for the automated license activation step, the following proxy settings must be added.
@@ -58,17 +58,14 @@ ARG WPR_ACCESS_KEY
5858

5959
ENV WPR_CONFIG_USE_ENV=true
6060
ENV WPR_FILE_OWNER=${WPR_USER_ID}:${WPR_GROUP_ID}
61-
ENV WPR_PRODUCTS=${WPR_PRODUCTS}
62-
ENV WPR_LANGUAGES=${WPR_LANGUAGES}
63-
ENV WPR_AI_MODELS=${WPR_AI_MODELS}
64-
ENV WPR_INSTALL_SAMPLES=${WPR_INSTALL_SAMPLES}
6561
ENV WPR_PROTOCOL=${WPR_PROTOCOL}
6662
ENV WPR_DOMAIN_NAME=${WPR_DOMAIN_NAME}
6763
ENV WPR_WEB_PORT=${WPR_WEB_PORT}
6864
ENV WPR_VIRTUAL_DIR=${WPR_VIRTUAL_DIR}
6965
ENV WPR_WEB_SERVER_TYPE=2
7066
ENV WPR_LICENSE_TICKET_ID=${WPR_LICENSE_TICKET_ID}
7167
ENV WPR_PATH_TO_SERVICE_FILES_DIRECTORY=${WPR_PATH_TO_SERVICE_FILES_DIRECTORY}
68+
ENV WPR_WSC_SERVICE_FILES_PATH=${WPR_WSC_SERVICE_FILES_PATH}
7269
ENV WPR_RESTART_WEB_SERVER=1
7370
ENV WPR_CERT_DIR=${WPR_CERT_DIR}
7471
ENV WPR_CERT_KEY_NAME=${WPR_CERT_KEY_NAME}
@@ -101,28 +98,39 @@ ENV WPR_ENABLE_REQUEST_VALIDATION=false
10198

10299
ENV WPR_ACCESS_KEY=${WPR_ACCESS_KEY}
103100

101+
RUN groupadd --gid ${WPR_GROUP_ID} $WPR_USER_NAME && useradd --no-log-init --uid ${WPR_USER_ID} --gid ${WPR_GROUP_ID} $WPR_USER_NAME
102+
103+
104+
FROM wpr_dependencies AS wpr_installer
105+
104106
RUN yum update -y --skip-broken && \
105-
yum module enable nginx:1.24 -y && \
106-
yum install -y nginx \
107-
java-17-openjdk-devel \
108-
perl \
109-
wget && \
110-
yum remove -y webkit2gtk3-jsc \
111-
python-setuptools \
112-
python-urllib3 \
113-
python-idna \
114-
python-requests && \
115-
yum clean all && rm -rf /var/cache/yum && \
116-
rm -rf /etc/nginx/conf.d/default.conf /usr/share/nginx/html/* && \
117-
rm -rf /var/log/nginx/* && \
118-
ln -sf /dev/stderr /var/log/nginx/error.log
107+
yum install -y wget
119108

120-
RUN groupadd --gid ${WPR_GROUP_ID} $WPR_USER_NAME && useradd --no-log-init --uid ${WPR_USER_ID} --gid ${WPR_GROUP_ID} $WPR_USER_NAME
109+
ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
110+
ARG WPR_DEPLOYMENT_DIR=/home
111+
ARG WPR_APP_ROOT_DIR=$WPR_DEPLOYMENT_DIR/WSC
112+
113+
# Comma-separated list of language IDs to install
114+
ARG WPR_LANGUAGES=en_US,en_GB,en_CA,en_AU
115+
# List of AI models to install:
116+
# 1. English language model
117+
# 2. English autocomplete model
118+
# 3. German language model
119+
# 4. Spanish language model
120+
ARG WPR_AI_MODELS=1,2
121+
ARG WPR_PRODUCTS=4
122+
ARG WPR_INSTALL_SAMPLES=1
123+
124+
ENV WPR_LANGUAGES=${WPR_LANGUAGES}
125+
ENV WPR_AI_MODELS=${WPR_AI_MODELS}
126+
ENV WPR_PRODUCTS=${WPR_PRODUCTS}
127+
ENV WPR_INSTALL_SAMPLES=${WPR_INSTALL_SAMPLES}
128+
129+
ENV WPR_AUTO_INSTALL=TRUE
121130

122131
RUN mkdir -p $WPR_CUSTOM_DICTIONARIES_DIR \
123132
$WPR_USER_DICTIONARIES_DIR \
124-
$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker \
125-
$WPR_APP_SERVER_DIR \
133+
$WPR_WSC_SERVICE_FILES_PATH \
126134
/var/run/nginx
127135

128136
COPY $WPR_FILES_DIR/$WPR_APP_NAME_MASK $WPR_DEPLOYMENT_DIR/
@@ -139,26 +147,43 @@ RUN PACKAGE_FILE=$(ls -1t $WPR_DEPLOYMENT_DIR/$WPR_APP_NAME_MASK 2>/dev/null | h
139147
ln -s /dev/stdout $WPR_APP_SERVER_DIR/Logs/Child-0.log && \
140148
ln -s /dev/stdout $WPR_APP_SERVER_DIR/Logs/Child-1.log && \
141149
ln -s /dev/stdout $WPR_APP_SERVER_DIR/Logs/Action.log && \
142-
chown -R ${WPR_USER_ID}:${WPR_GROUP_ID} $WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker $WPR_DICTIONARIES_DIR $WPR_APP_SERVER_DIR
143-
144-
COPY $WPR_FILES_DIR/certificate/$WPR_CERT_KEY_NAME $WPR_CERT_DIR/$WPR_CERT_KEY_NAME
145-
COPY $WPR_FILES_DIR/certificate/$WPR_CERT_FILE_NAME $WPR_CERT_DIR/$WPR_CERT_FILE_NAME
146-
COPY $WPR_FILES_DIR/configure* $WPR_APP_SERVER_DIR/
147-
COPY $WPR_FILES_DIR/startService.sh $WPR_APP_SERVER_DIR
148-
RUN chown ${WPR_USER_ID}:${WPR_GROUP_ID} $WPR_APP_SERVER_DIR/startService.sh && \
149-
chown ${WPR_USER_ID}:${WPR_GROUP_ID} $WPR_APP_SERVER_DIR/configureFiles.pl && \
150-
chown ${WPR_USER_ID}:${WPR_GROUP_ID} $WPR_APP_SERVER_DIR/configureWebServer.pl && \
151-
chmod +x $WPR_APP_SERVER_DIR/startService.sh
152-
153-
RUN chown -R ${WPR_USER_ID}:${WPR_GROUP_ID} /var/log/nginx \
150+
chown -R ${WPR_FILE_OWNER} $WPR_WSC_SERVICE_FILES_PATH $WPR_DICTIONARIES_DIR $WPR_APP_INSTALL_DIR
151+
152+
153+
FROM wpr_dependencies AS wpr_service
154+
155+
ARG WPR_WEB_SERVER_PORT=8080
156+
ARG WPR_WEB_SERVER_SSL_PORT=8443
157+
158+
ENV WPR_WEB_SERVER_PORT=${WPR_WEB_SERVER_PORT}
159+
ENV WPR_WEB_SERVER_SSL_PORT=${WPR_WEB_SERVER_SSL_PORT}
160+
161+
EXPOSE $WPR_WEB_SERVER_PORT
162+
EXPOSE $WPR_WEB_SERVER_SSL_PORT
163+
EXPOSE 2880
164+
165+
RUN mkdir -p /var/run/nginx && chown -R ${WPR_FILE_OWNER} /var/run/nginx
166+
167+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_APP_INSTALL_DIR $WPR_APP_INSTALL_DIR
168+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_WSC_SERVICE_FILES_PATH $WPR_WSC_SERVICE_FILES_PATH
169+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_DICTIONARIES_DIR $WPR_DICTIONARIES_DIR
170+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
171+
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
172+
173+
COPY --chown=${WPR_FILE_OWNER} $WPR_FILES_DIR/certificate/$WPR_CERT_KEY_NAME $WPR_CERT_DIR/$WPR_CERT_KEY_NAME
174+
COPY --chown=${WPR_FILE_OWNER} $WPR_FILES_DIR/certificate/$WPR_CERT_FILE_NAME $WPR_CERT_DIR/$WPR_CERT_FILE_NAME
175+
COPY --chown=${WPR_FILE_OWNER} $WPR_FILES_DIR/configure* $WPR_APP_SERVER_DIR/
176+
COPY --chown=${WPR_FILE_OWNER} $WPR_FILES_DIR/startService.sh $WPR_APP_SERVER_DIR
177+
178+
RUN chmod +x $WPR_APP_SERVER_DIR/startService.sh
179+
180+
RUN chown -R ${WPR_FILE_OWNER} /var/log/nginx \
154181
/usr/sbin/nginx \
155182
/var/lib/nginx \
156183
/var/run/nginx \
157184
/etc/nginx
158185

159-
RUN yum remove -y wget && \
160-
yum clean all && rm -rf /var/cache/yum && \
161-
rm -rf /tmp/* && \
186+
RUN rm -rf /tmp/* && \
162187
rm -rf /var/tmp/*
163188

164189
USER $WPR_USER_NAME

0 commit comments

Comments
 (0)