Skip to content

Commit

Permalink
Try a other way around getting LANG right for httpd in migrid container:
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jonasbardino committed Jan 9, 2025
1 parent 630f2eb commit 81a4583
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Dockerfile.rocky9
Original file line number Diff line number Diff line change
Expand Up @@ -1411,8 +1411,6 @@ RUN if [ "${ENABLE_LOGROTATE}" = "True" ]; then \

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

WORKDIR $MIG_ROOT

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

Expand Down
2 changes: 1 addition & 1 deletion migrid-httpd.env
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ APACHE_ARGUMENTS=-f ${APACHE_ETC_DIR}/${APACHE_DAEMON}.conf -d ${APACHE_ETC_DIR}
#export APACHE_LOG_DIR
#export APACHE_ETC_DIR
#export APACHE_ARGUMENTS
#NOTE: do NOT export LANG here when disabled above
#export LANG

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

0 comments on commit 81a4583

Please sign in to comment.