Skip to content

Commit 29d0ffb

Browse files
Move apt-get to the top for better cache utilization
1 parent 9789bb2 commit 29d0ffb

1 file changed

Lines changed: 20 additions & 21 deletions

File tree

Dockerfile.ubuntu-prebuilt

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG WPR_USER_ID=2000
1010
ARG WPR_GROUP_ID=2000
1111
ARG WPR_USER_NAME=wsc
1212

13-
FROM webspellchecker/wproofreader:${TAG} AS wpr_base
13+
FROM webspellchecker/wproofreader:${TAG} AS wpr_install_languages
1414

1515
USER root
1616

@@ -48,10 +48,19 @@ RUN chown -R ${WPR_USER_ID}:${WPR_GROUP_ID} ${WPR_WSC_SERVICE_FILES_PATH} \
4848
${WPR_CERT_DIR} \
4949
${WPR_APP_INSTALL_DIR}
5050

51-
FROM ubuntu:24.04 AS service
51+
FROM ubuntu:24.04 AS wpr_service
5252

5353
USER root
5454

55+
RUN apt-get update && \
56+
apt-get upgrade -y perl && \
57+
apt-get install -y --no-install-recommends nginx default-jre && \
58+
apt-get clean && \
59+
rm -rf /var/lib/apt/lists/* && \
60+
rm -rf /etc/nginx/sites-enabled/default /var/www/html/* && \
61+
rm -rf /var/log/nginx/* && \
62+
ln -sf /dev/stderr /var/log/nginx/error.log
63+
5564
ARG WPR_WEB_SERVER_PORT=8080
5665
ARG WPR_WEB_SERVER_SSL_PORT=8443
5766

@@ -75,7 +84,6 @@ ARG WPR_CERT_KEY_NAME=key.pem
7584
ARG WPR_CERT_FILE_NAME=cert.pem
7685
ARG WPR_APP_INSTALL_DIR=/opt/WebSpellChecker
7786
ARG WPR_APP_SERVER_DIR=$WPR_APP_INSTALL_DIR/AppServer
78-
ARG WPR_APP_NAME_MASK=wsc_app*tar.gz
7987
ARG WPR_PATH_TO_SERVICE_FILES_DIRECTORY=/var/lib
8088
ARG WPR_WSC_SERVICE_FILES_PATH=$WPR_PATH_TO_SERVICE_FILES_DIRECTORY/WebSpellChecker
8189

@@ -144,25 +152,16 @@ ENV DEBIAN_FRONTEND=noninteractive
144152

145153
RUN groupadd --gid ${WPR_GROUP_ID} $WPR_USER_NAME && useradd --no-log-init --uid ${WPR_USER_ID} --gid ${WPR_GROUP_ID} $WPR_USER_NAME
146154

147-
RUN apt-get update && \
148-
apt-get upgrade -y perl && \
149-
apt-get install -y --no-install-recommends nginx default-jre && \
150-
apt-get clean && \
151-
rm -rf /var/lib/apt/lists/* && \
152-
rm -rf /etc/nginx/sites-enabled/default /var/www/html/* && \
153-
rm -rf /var/log/nginx/* && \
154-
ln -sf /dev/stderr /var/log/nginx/error.log
155-
156-
RUN mkdir -p /var/run/nginx
157-
158-
COPY --from=wpr_base --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /opt/WebSpellChecker ${WPR_APP_INSTALL_DIR}
159-
COPY --from=wpr_base --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /var/lib/WebSpellChecker ${WPR_WSC_SERVICE_FILES_PATH}
160-
COPY --from=wpr_base --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
161-
COPY --from=wpr_base --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
162-
COPY --from=wpr_base --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /dictionaries ${WPR_DICTIONARIES_DIR}
163-
COPY --from=wpr_base --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /certificate ${WPR_CERT_DIR}
155+
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /opt/WebSpellChecker ${WPR_APP_INSTALL_DIR}
156+
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /var/lib/WebSpellChecker ${WPR_WSC_SERVICE_FILES_PATH}
157+
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx/conf.d/wscservice.conf /etc/nginx/conf.d/wscservice.conf
158+
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx/nginx.conf /etc/nginx/nginx.conf
159+
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /dictionaries ${WPR_DICTIONARIES_DIR}
160+
COPY --from=wpr_install_languages --chown=${WPR_USER_ID}:${WPR_GROUP_ID} /certificate ${WPR_CERT_DIR}
164161

165-
RUN chown -R ${WPR_USER_ID}:${WPR_GROUP_ID} /var/run/nginx \
162+
RUN mkdir -p /var/run/nginx && \
163+
chown -R ${WPR_USER_ID}:${WPR_GROUP_ID} /etc/nginx \
164+
/var/run/nginx \
166165
/var/log/nginx \
167166
/usr/sbin/nginx \
168167
/var/lib/nginx \

0 commit comments

Comments
 (0)