diff --git a/Dockerfile b/Dockerfile index 0ef3736..e9bdcfb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,9 +40,7 @@ ARG PROTOCOL=2 ARG WEB_PORT ARG DOMAIN_NAME=localhost ARG VIRTUAL_DIR=wscservice -# Change to 1 to activate the license during the image build. -ARG ACTIVATE_LICENSE=0 -# Specify license ticket ID if ACTIVATE_LICENSE is set to 1. For example, LICENSE_TICKET_ID = 6u*************ZO +# Specify license ticket ID to activate the license during the image build. For example, LICENSE_TICKET_ID = 6u*************ZO ARG LICENSE_TICKET_ID ARG PRODUCTS=4 ARG LANGUAGES=en_US,en_GB,en_CA,en_AU @@ -70,7 +68,6 @@ ENV DOMAIN_NAME=${DOMAIN_NAME} ENV WEB_PORT=${WEB_PORT} ENV VIRTUAL_DIR=${VIRTUAL_DIR} ENV WEB_SERVER_TYPE=2 -ENV ACTIVATE_LICENSE=${ACTIVATE_LICENSE} ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID} ENV SERVICE_FILES_DIR=${SERVICE_FILES_DIR} ENV RESTART_WEB_SERVER=1 diff --git a/Dockerfile.centos b/Dockerfile.centos index d92174d..53c35f2 100755 --- a/Dockerfile.centos +++ b/Dockerfile.centos @@ -38,9 +38,7 @@ ARG PROTOCOL=2 ARG WEB_PORT ARG DOMAIN_NAME=localhost ARG VIRTUAL_DIR=wscservice -# Change to 1 to activate the license during the image build. -ARG ACTIVATE_LICENSE=0 -# Specify license ticket ID if ACTIVATE_LICENSE is set to 1. For example, LICENSE_TICKET_ID = 6u*************ZO +# Specify license ticket ID to activate the license during the image build. For example, LICENSE_TICKET_ID = 6u*************ZO ARG LICENSE_TICKET_ID ARG PRODUCTS=4 ARG LANGUAGES=en_US,en_GB,en_CA,en_AU @@ -68,7 +66,6 @@ ENV DOMAIN_NAME=${DOMAIN_NAME} ENV WEB_PORT=${WEB_PORT} ENV VIRTUAL_DIR=${VIRTUAL_DIR} ENV WEB_SERVER_TYPE=2 -ENV ACTIVATE_LICENSE=${ACTIVATE_LICENSE} ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID} ENV SERVICE_FILES_DIR=${SERVICE_FILES_DIR} ENV RESTART_WEB_SERVER=1 diff --git a/Dockerfile.redhat b/Dockerfile.redhat index 220a010..628d5c4 100644 --- a/Dockerfile.redhat +++ b/Dockerfile.redhat @@ -38,9 +38,7 @@ ARG PROTOCOL=2 ARG WEB_PORT ARG DOMAIN_NAME=localhost ARG VIRTUAL_DIR=wscservice -# Change to 1 to activate the license during the image build. -ARG ACTIVATE_LICENSE=0 -# Specify license ticket ID if ACTIVATE_LICENSE is set to 1. For example, LICENSE_TICKET_ID = 6u*************ZO +# Specify license ticket ID to activate the license during the image build. For example, LICENSE_TICKET_ID = 6u*************ZO ARG LICENSE_TICKET_ID ARG PRODUCTS=4 ARG LANGUAGES=en_US,en_GB,en_CA,en_AU @@ -68,7 +66,6 @@ ENV DOMAIN_NAME=${DOMAIN_NAME} ENV WEB_PORT=${WEB_PORT} ENV VIRTUAL_DIR=${VIRTUAL_DIR} ENV WEB_SERVER_TYPE=2 -ENV ACTIVATE_LICENSE=${ACTIVATE_LICENSE} ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID} ENV SERVICE_FILES_DIR=${SERVICE_FILES_DIR} ENV RESTART_WEB_SERVER=1 diff --git a/Dockerfile.ubuntu-prebuilt b/Dockerfile.ubuntu-prebuilt index 28b057a..971dcc0 100644 --- a/Dockerfile.ubuntu-prebuilt +++ b/Dockerfile.ubuntu-prebuilt @@ -13,9 +13,7 @@ ARG PROTOCOL=2 ARG WEB_PORT ARG DOMAIN_NAME=localhost ARG VIRTUAL_DIR=wscservice -# Change to 1 to activate the license during the image build. -ARG ACTIVATE_LICENSE=0 -# Specify license ticket ID if ACTIVATE_LICENSE is set to 1. For example, LICENSE_TICKET_ID = 6u*************ZO +# Specify license ticket ID to activate the license during the image build. For example, LICENSE_TICKET_ID = 6u*************ZO ARG LICENSE_TICKET_ID ARG PRODUCTS=4 ARG AI_MODELS=1,2 @@ -42,7 +40,6 @@ ENV DOMAIN_NAME=${DOMAIN_NAME} ENV WEB_PORT=${WEB_PORT} ENV VIRTUAL_DIR=${VIRTUAL_DIR} ENV WEB_SERVER_TYPE=2 -ENV ACTIVATE_LICENSE=${ACTIVATE_LICENSE} ENV LICENSE_TICKET_ID=${LICENSE_TICKET_ID} ENV RESTART_WEB_SERVER=1 @@ -73,7 +70,7 @@ RUN if [ -z $(egrep -i "^${USER_NAME}" /etc/group) ]; then \ RUN perl ${APP_SERVER_DIR}/install_languages.pl ${APP_SERVER_DIR}/AppServerX.xml "${AI_MODELS}" "${LANGUAGES}" "${SERVICE_FILES_DIR}/WebSpellChecker" -RUN if [ "${ACTIVATE_LICENSE}" = 1 ] && [ ! -z "${LICENSE_TICKET_ID}" ]; then \ +RUN if [ ! -z "${LICENSE_TICKET_ID}" ]; then \ sh ${APP_SERVER_DIR}/activateLicense.sh ${LICENSE_TICKET_ID} -y; \ fi; diff --git a/README.md b/README.md index 6e8794e..7cb9f28 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ ARG PROTOCOL=2 ARG WEB_PORT ARG DOMAIN_NAME=localhost ARG VIRTUAL_DIR=wscservice -ARG ACTIVATE_LICENSE=0 ARG LICENSE_TICKET_ID ARG PRODUCTS=4 ARG INSTALL_SAMPLES=1 @@ -42,9 +41,8 @@ where `LANGUAGES` accepts a comma-separated list of language IDs, `AI_MODELS` English language and autocomplete models are available for en_US (American English), en_GB (British English), en_CA (Canadian English) and en_AU (Australian English). German – for de_DE (Germany), Spanish – for es_ES (Spain). -* Activate license. Update the values for the following options: +* Activate license. Update the value for the following option: ``` -ARG ACTIVATE_LICENSE=1 ARG LICENSE_TICKET_ID=6u*************ZO ``` * Specify `DOMAIN_NAME` which will be used for the setup of demo samples with WProofreader. By default, `localhost` will be used if nothing is specified. @@ -84,7 +82,7 @@ where: Also, if you don't want to modify the `Dockerfile` you can provide any installation parameter via CLI through the `--build-arg` flag. For example: ``` -docker build -t local/wsc_app:x.x.x --build-arg ACTIVATE_LICENSE=1 --build-arg LICENSE_TICKET_ID=6u*************ZO --build-arg LANGUAGES=en_US,en_GB -f Dockerfile . +docker build -t local/wsc_app:x.x.x --build-arg LICENSE_TICKET_ID=6u*************ZO --build-arg LANGUAGES=en_US,en_GB -f Dockerfile . ``` ### Choosing platform