Skip to content

Commit a9bf49b

Browse files
committed
Remove OpenVex file download and installation
1 parent 101c637 commit a9bf49b

3 files changed

Lines changed: 2 additions & 14 deletions

File tree

Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
2323
ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
2424
ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
2525
ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
26-
ARG WPR_VEX_DIR=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/vex
2726
ARG WPR_USER_ID=2000
2827
ARG WPR_GROUP_ID=2000
2928
ARG WPR_USER_NAME=wsc
@@ -101,7 +100,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget
101100
ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
102101
ARG WPR_DEPLOYMENT_DIR=/home
103102
ARG WPR_APP_ROOT_DIR=$WPR_DEPLOYMENT_DIR/WSC
104-
ARG WPR_VEX_FILE_URL=https://files.webspellchecker.com/security/vex/opennlp-cves-v2.0.0.vex.json
105103

106104
# Comma-separated list of language IDs to install
107105
ARG WPR_LANGUAGES=en_US,en_GB,en_CA,en_AU
@@ -124,9 +122,7 @@ ENV WPR_AUTO_INSTALL=TRUE
124122
RUN mkdir -p $WPR_CUSTOM_DICTIONARIES_DIR \
125123
$WPR_USER_DICTIONARIES_DIR \
126124
$WPR_WSC_SERVICE_FILES_PATH \
127-
$WPR_VEX_DIR \
128-
/var/run/nginx && \
129-
wget -O $WPR_VEX_DIR/opennlp-cves.vex.json $WPR_VEX_FILE_URL
125+
/var/run/nginx
130126

131127
COPY $WPR_FILES_DIR/$WPR_APP_NAME_MASK $WPR_DEPLOYMENT_DIR/
132128
RUN PACKAGE_FILE=$(ls -1t $WPR_DEPLOYMENT_DIR/$WPR_APP_NAME_MASK 2>/dev/null | head -n 1) && \
@@ -164,7 +160,6 @@ RUN mkdir -p /var/run/nginx && chown -R ${WPR_FILE_OWNER} /var/run/nginx
164160
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_APP_INSTALL_DIR $WPR_APP_INSTALL_DIR
165161
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_WSC_SERVICE_FILES_PATH $WPR_WSC_SERVICE_FILES_PATH
166162
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_DICTIONARIES_DIR $WPR_DICTIONARIES_DIR
167-
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_VEX_DIR $WPR_VEX_DIR
168163
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
169164
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
170165

Dockerfile.redhat

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
3030
ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
3131
ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
3232
ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
33-
ARG WPR_VEX_DIR=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/vex
3433
ARG WPR_USER_ID=2000
3534
ARG WPR_GROUP_ID=2000
3635
ARG WPR_USER_NAME=wsc
@@ -109,7 +108,6 @@ RUN yum update -y --skip-broken && \
109108
ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
110109
ARG WPR_DEPLOYMENT_DIR=/home
111110
ARG WPR_APP_ROOT_DIR=$WPR_DEPLOYMENT_DIR/WSC
112-
ARG WPR_VEX_FILE_URL=https://files.webspellchecker.com/security/vex/opennlp-cves-v2.0.0.vex.json
113111

114112
# Comma-separated list of language IDs to install
115113
ARG WPR_LANGUAGES=en_US,en_GB,en_CA,en_AU
@@ -132,9 +130,7 @@ ENV WPR_AUTO_INSTALL=TRUE
132130
RUN mkdir -p $WPR_CUSTOM_DICTIONARIES_DIR \
133131
$WPR_USER_DICTIONARIES_DIR \
134132
$WPR_WSC_SERVICE_FILES_PATH \
135-
$WPR_VEX_DIR \
136-
/var/run/nginx && \
137-
wget -O $WPR_VEX_DIR/opennlp-cves.vex.json $WPR_VEX_FILE_URL
133+
/var/run/nginx
138134

139135
COPY $WPR_FILES_DIR/$WPR_APP_NAME_MASK $WPR_DEPLOYMENT_DIR/
140136
RUN PACKAGE_FILE=$(ls -1t $WPR_DEPLOYMENT_DIR/$WPR_APP_NAME_MASK 2>/dev/null | head -n 1) && \
@@ -170,7 +166,6 @@ RUN mkdir -p /var/run/nginx && chown -R ${WPR_FILE_OWNER} /var/run/nginx
170166
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_APP_INSTALL_DIR $WPR_APP_INSTALL_DIR
171167
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_WSC_SERVICE_FILES_PATH $WPR_WSC_SERVICE_FILES_PATH
172168
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_DICTIONARIES_DIR $WPR_DICTIONARIES_DIR
173-
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} $WPR_VEX_DIR $WPR_VEX_DIR
174169
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
175170
COPY --from=wpr_installer --chown=${WPR_FILE_OWNER} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
176171

Dockerfile.ubuntu-prebuilt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
9393
ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
9494
ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
9595
ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
96-
ARG WPR_VEX_DIR=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/vex
9796

9897
ENV WPR_APP_SERVER_DIR=${WPR_APP_SERVER_DIR}
9998

@@ -160,7 +159,6 @@ RUN groupadd --gid ${WPR_GROUP_ID} $WPR_USER_NAME && useradd --no-log-init --uid
160159

161160
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /opt/WebSpellChecker ${WPR_APP_INSTALL_DIR}
162161
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /var/lib/WebSpellChecker ${WPR_WSC_SERVICE_FILES_PATH}
163-
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} ${WPR_VEX_DIR} ${WPR_VEX_DIR}
164162
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
165163
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
166164
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /dictionaries ${WPR_DICTIONARIES_DIR}

0 commit comments

Comments
 (0)