diff --git a/Dockerfile b/Dockerfile index 1aee83eae..906727929 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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"] diff --git a/bin/startup.sh b/bin/startup.sh new file mode 100644 index 000000000..7f41ce940 --- /dev/null +++ b/bin/startup.sh @@ -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 diff --git a/dockerfiles/splash/provision.sh b/dockerfiles/splash/provision.sh index bdd04c8ae..f3fc504bd 100755 --- a/dockerfiles/splash/provision.sh +++ b/dockerfiles/splash/provision.sh @@ -72,7 +72,9 @@ install_deps () { libre2 \ libicu52 \ liblua5.2-0 \ - zlib1g + zlib1g \ + dbus + } install_builddeps () {