Skip to content

Commit

Permalink
Force utf8 locale in all migrid services (#80)
Browse files Browse the repository at this point in the history
Reuse explicit `LANG` locale setup from `apache-minimal` service helper
in `migrid` init script in order to have consistent sane locale in all
`migrid` services. This is mainly in relation to the encoding issues we
noticed with exotic characters in the `MiGserver.conf` when implicitly
loaded and parsed as ascii in the sftpsubsys PAM module in containers.

This PR should obsolete ucphhpc/migrid-sync#177
.
  • Loading branch information
jonasbardino authored Jan 20, 2025
2 parents 17cd21c + 60c74c4 commit 0d007aa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 4 additions & 2 deletions Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -1519,8 +1519,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 @@ -1619,6 +1617,10 @@ 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 explicit LANG set above for apache and migrid services
RUN sed "s/#LANG=.*/LANG=${LANG}/g" /app/migrid-httpd-init.sh > /etc/sysconfig/apache-minimal
RUN grep LANG /etc/sysconfig/apache-minimal > /etc/sysconfig/migrid
RUN chown $USER:$GROUP /app/docker-entry.sh \
&& chmod +x /app/docker-entry.sh

Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.rocky8
Original file line number Diff line number Diff line change
Expand Up @@ -1544,8 +1544,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 @@ -1644,6 +1642,10 @@ 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 explicit LANG set above for apache and migrid services
RUN sed "s/#LANG=.*/LANG=${LANG}/g" /app/migrid-httpd-init.sh > /etc/sysconfig/apache-minimal
RUN grep LANG /etc/sysconfig/apache-minimal > /etc/sysconfig/migrid
RUN chown $USER:$GROUP /app/docker-entry.sh \
&& chmod +x /app/docker-entry.sh

Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.rocky9
Original file line number Diff line number Diff line change
Expand Up @@ -1517,8 +1517,9 @@ 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
# NOTE: inherit explicit LANG set above for apache and migrid services
RUN sed "s/#LANG=.*/LANG=${LANG}/g" /app/migrid-httpd-init.sh > /etc/sysconfig/apache-minimal
RUN grep LANG /etc/sysconfig/apache-minimal > /etc/sysconfig/migrid
RUN chown $USER:$GROUP /app/docker-entry.sh \
&& chmod +x /app/docker-entry.sh

Expand Down

0 comments on commit 0d007aa

Please sign in to comment.