Skip to content

Commit b2ae6cc

Browse files
mhayaclaude
andcommitted
fix(nginx): arm64 で shibauthorizer / shibresponder が起動しない問題を直す
supervisord.conf は shibauthorizer / shibresponder を /usr/lib/x86_64-linux-gnu/shibboleth/ から起動するが、arm64 では /usr/lib/aarch64-linux-gnu/shibboleth/ にあるため FATAL になり、 /secure/ の shib_request が通らず Shibboleth でログインできなかった。 supervisord.conf は Dockerfile と Dockerfile.arm64 で共有しているので、 ビルド時に uname -m でパスを書き換える。x86_64 では書き換わらない。 両 Dockerfile は同じ内容に保つ。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent 4be9e0a commit b2ae6cc

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

‎nginx/Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ RUN dpkg -i nginx_1.20.1-1~focal_*.deb
5959

6060

6161
ADD supervisord.conf /etc/supervisor/supervisord.conf
62+
# supervisord.conf points shibauthorizer / shibresponder at the x86_64
63+
# library directory. Rewrite it for the build architecture (e.g. aarch64).
64+
RUN sed -i "s#/usr/lib/x86_64-linux-gnu/shibboleth/#/usr/lib/$(uname -m)-linux-gnu/shibboleth/#g" \
65+
/etc/supervisor/supervisord.conf
6266
ADD shibboleth2.xml /etc/shibboleth/shibboleth2.xml
6367
ADD attribute-map.xml /etc/shibboleth/attribute-map.xml
6468
ADD attribute-policy.xml /etc/shibboleth/attribute-policy.xml

‎nginx/Dockerfile.arm64‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ RUN dpkg -i nginx_1.20.1-1~focal_*.deb
5959

6060

6161
ADD supervisord.conf /etc/supervisor/supervisord.conf
62+
# supervisord.conf points shibauthorizer / shibresponder at the x86_64
63+
# library directory. Rewrite it for the build architecture (e.g. aarch64).
64+
RUN sed -i "s#/usr/lib/x86_64-linux-gnu/shibboleth/#/usr/lib/$(uname -m)-linux-gnu/shibboleth/#g" \
65+
/etc/supervisor/supervisord.conf
6266
ADD shibboleth2.xml /etc/shibboleth/shibboleth2.xml
6367
ADD attribute-map.xml /etc/shibboleth/attribute-map.xml
6468
ADD attribute-policy.xml /etc/shibboleth/attribute-policy.xml

0 commit comments

Comments
 (0)