Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dbus dependency #493

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Dbus dependency #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6ae7f7
Add dbus dependency when installing package dependencies
mabong1 Aug 10, 2016
fe500ae
Add entrypoint to generate the machine UUID on startup
mabong1 Aug 10, 2016
adb64c3
Add startup script as entrypoint for the container
mabong1 Aug 10, 2016
742051f
Add startup script file to the container and set it as entrypoint
mabong1 Aug 10, 2016
f3e8b15
Add new line at end of file
mabong1 Aug 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,9 @@ VOLUME [ \

EXPOSE 8050 8051 5023

ENTRYPOINT [ \
"python3", \
"/app/bin/splash", \
"--proxy-profiles-path", "/etc/splash/proxy-profiles", \
"--js-profiles-path", "/etc/splash/js-profiles", \
"--filters-path", "/etc/splash/filters", \
"--lua-package-path", "/etc/splash/lua_modules/?.lua" \
]
# Copy start script
COPY bin/startup.sh /home/root/startup.sh
RUN chmod +x /home/root/startup.sh

# Start up script (Generate machine UUID)
ENTRYPOINT ["/home/root/startup.sh"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is not the same as before: previously it was possible to pass command-line arguments to Splash when it is executed from a Docker container (see http://splash.readthedocs.io/en/stable/install.html#passing-custom-options); it looks like you need to handle extra arguments in a script.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok I will look at it and commit again later.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Other than that, the PR looks very clean.

13 changes: 13 additions & 0 deletions bin/startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh
# Startup script for splash container . Suppress machine-id warning
# by generatin and UUID for the virtual machine

# Generate machine UUI
/bin/dbus-uuidgen > /etc/machine-id

# Run splash
python3 /app/bin/splash \
--proxy-profiles-path /etc/splash/proxy-profiles \
--js-profiles-path /etc/splash/js-profiles \
--filters-path /etc/splash/filters \
--lua-package-path /etc/splash/lua_modules/?.lua
4 changes: 3 additions & 1 deletion dockerfiles/splash/provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ install_deps () {
libre2 \
libicu52 \
liblua5.2-0 \
zlib1g
zlib1g \
dbus

}

install_builddeps () {
Expand Down