Skip to content

Commit

Permalink
Merge pull request #59 from rstudio/entrypoint-issue
Browse files Browse the repository at this point in the history
make touch / tail work
  • Loading branch information
colearendt authored Mar 30, 2021
2 parents c74a6b6 + 9e9de53 commit f8594a6
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions helper/workbench/startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ mkdir -p /var/lib/rstudio-launcher
chown rstudio-server:rstudio-server /var/lib/rstudio-launcher
su rstudio-server -c 'touch /var/lib/rstudio-launcher/rstudio-launcher.log'
touch /var/log/rstudio-server.log
touch /var/log/rstudio-launcher.log
mkdir -p /var/lib/rstudio-launcher/Local
chown rstudio-server:rstudio-server /var/lib/rstudio-launcher/Local
su rstudio-server -c 'touch /var/lib/rstudio-launcher/Local/rstudio-local-launcher-placeholder.log'
Expand Down Expand Up @@ -64,7 +65,7 @@ fi

# Start Launcher
if [ "$RSP_LAUNCHER" == "true" ]; then
/usr/lib/rstudio-server/bin/rstudio-launcher > /var/log/rstudio-launcher.log 2>&1 &
/usr/lib/rstudio-server/bin/rstudio-launcher >> /var/log/rstudio-launcher.log 2>&1 &
wait-for-it.sh localhost:5559 -t $RSP_LAUNCHER_TIMEOUT
fi

Expand All @@ -78,4 +79,4 @@ tail -n 100 -f \

# the main container process
# cannot use "exec" or the "trap" will be lost
/usr/lib/rstudio-server/bin/rserver --server-daemonize 0 > /var/log/rstudio-server.log 2>&1
/usr/lib/rstudio-server/bin/rserver --server-daemonize 0 >> /var/log/rstudio-server.log 2>&1

0 comments on commit f8594a6

Please sign in to comment.