From dad6e4ccd005cc9f3eb2e0348d4097db7131885b Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 5 Mar 2019 16:15:57 -0500 Subject: [PATCH 1/3] Update supervisord.conf --- containerfiles/supervisord.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/containerfiles/supervisord.conf b/containerfiles/supervisord.conf index 9d2ef01..3a484e5 100755 --- a/containerfiles/supervisord.conf +++ b/containerfiles/supervisord.conf @@ -16,7 +16,7 @@ stderr_logfile_maxbytes=0 directory=/usr/bin [program:shibui] -command=/usr/bin/java -Didp.home=/idp-home -jar /opt/shibui/shibui.jar +command=/usr/bin/java -Didp.home=/idp-home -jar /opt/shibui/shibui.jar --shibui.user-bootstrap-resource=file:users.txt directory=/opt/shibui autostart=true autorestart=true @@ -26,4 +26,4 @@ stderr_logfile=/proc/1/fd/1 stderr_logfile_maxbytes=0 [include] -files=/etc/supervisor/conf.d/* \ No newline at end of file +files=/etc/supervisor/conf.d/* From b07fc0b1b4e790eb0d0e9a6cef2a47a269c7a0fb Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 5 Mar 2019 16:16:23 -0500 Subject: [PATCH 2/3] Create users.txt --- containerfiles/users.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 containerfiles/users.txt diff --git a/containerfiles/users.txt b/containerfiles/users.txt new file mode 100644 index 0000000..b635ab1 --- /dev/null +++ b/containerfiles/users.txt @@ -0,0 +1 @@ +root,{bcrypt}$2a$10$V1jeTIc0b2u7Y3yU.LqkXOPRVTBFc7SW07QaJR4KrBAmWGgTcO9H.,first,last,ROLE_ADMIN,user1@example.org From 41bb38cb8a26d63f680d26abdb69fcf68f045fa0 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Tue, 5 Mar 2019 16:17:02 -0500 Subject: [PATCH 3/3] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 30a9ad6..6c8e10c 100755 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,7 @@ RUN mkdir -p /opt/shibui COPY --from=bootstrap shibui.jar /opt/shibui/ COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf +COPY containerfiles/users.txt /opt/shibui COPY containerfiles/sendtierbeacon.sh /usr/bin COPY containerfiles/setupcron.sh /usr/bin RUN chmod +x /usr/bin/sendtierbeacon.sh \ @@ -46,4 +47,4 @@ RUN chmod +x /usr/bin/sendtierbeacon.sh \ WORKDIR /opt/shibui -CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] \ No newline at end of file +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]