Skip to content

Commit 81a4583

Browse files
committed
Try a other way around getting LANG right for httpd in migrid container:
revert previous change and instead inject the Dockerfile LANG env value in the /etc/sysconfig/apache-minimal file based on the contents of migrid-httpd-init.sh.
1 parent 630f2eb commit 81a4583

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Dockerfile.rocky9

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,8 +1411,6 @@ RUN if [ "${ENABLE_LOGROTATE}" = "True" ]; then \
14111411

14121412
# Init scripts
14131413
RUN cp generated-confs/migrid-init.d-rh /etc/init.d/migrid
1414-
COPY migrid-httpd-init.sh /etc/sysconfig/apache-minimal
1415-
COPY apache-init-helper /etc/init.d/apache-minimal
14161414

14171415
WORKDIR $MIG_ROOT
14181416

@@ -1511,6 +1509,9 @@ ENTRYPOINT ["/tini", "--"]
15111509
ADD docker-entry.sh /app/docker-entry.sh
15121510
ADD migrid-httpd.env /app/migrid-httpd.env
15131511
ADD migrid-httpd-init.sh /app/migrid-httpd-init.sh
1512+
ADD apache-init-helper /etc/init.d/apache-minimal
1513+
# NOTE: inherit LANG set above for apache
1514+
RUN sed "s/#LANG=.*/LANG=${LANG}/g" /app/migrid-httpd-init.sh > /etc/sysconfig/apache-minimal
15141515
RUN chown $USER:$GROUP /app/docker-entry.sh \
15151516
&& chmod +x /app/docker-entry.sh
15161517

migrid-httpd.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ APACHE_ARGUMENTS=-f ${APACHE_ETC_DIR}/${APACHE_DAEMON}.conf -d ${APACHE_ETC_DIR}
4141
#export APACHE_LOG_DIR
4242
#export APACHE_ETC_DIR
4343
#export APACHE_ARGUMENTS
44-
#NOTE: do NOT export LANG here when disabled above
44+
#export LANG
4545

4646
## The command to get the status for 'apache(2)?ctl status'.
4747
## Some packages providing 'www-browser' need '--dump' instead of '-dump'.

0 commit comments

Comments
 (0)