Merge pull request #2 from docker/1.5.0

create bootstrap file
docker · Mar 5, 2019 · 5caf021 · 5caf021
2 parents db58365 + 41bb38c
commit 5caf021
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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"]
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
diff --git 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/*
+files=/etc/supervisor/conf.d/*
diff --git a/containerfiles/users.txt b/containerfiles/users.txt
@@ -0,0 +1 @@
+root,{bcrypt}$2a$10$V1jeTIc0b2u7Y3yU.LqkXOPRVTBFc7SW07QaJR4KrBAmWGgTcO9H.,first,last,ROLE_ADMIN,user1@example.org