ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add plugin key handling to Dockerfile

install-with-shinobicctv-user-instead-of-root
Moe 2020-08-28 15:29:55 -07:00
parent 41cd51ccd6
commit 6ba5b33820
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docker/init.sh
View File

@ -71,7 +71,7 @@ if [ ! -e "./conf.json" ]; then
sudo cp conf.sample.json conf.json
fi
sudo sed -i -e 's/change_this_to_something_very_random__just_anything_other_than_this/'"$cronKey"'/g' conf.json
node tools/modifyConfiguration.js cpuUsageMarker=CPU subscriptionId=$SUBSCRIPTION_ID thisIsDocker=true
node tools/modifyConfiguration.js cpuUsageMarker=CPU subscriptionId=$SUBSCRIPTION_ID thisIsDocker=true pluginKeys="$PLUGIN_KEYS"
sudo cp conf.json /config/conf.json

7
Dockerfile
View File

@ -7,6 +7,7 @@ ENV DB_USER=majesticflame \
DB_ROOT_PASSWORD=mizukagesbluedress \
DB_ROOT_USER=root \
SUBSCRIPTION_ID=sub_XXXXXXXXXXXX \
PLUGIN_KEYS='{}' \
DB_DISABLE_INCLUDED=false
ARG DEBIAN_FRONTEND=noninteractive
@ -16,7 +17,7 @@ RUN apt update -y
RUN apt install wget curl net-tools -y
# Install MariaDB server... the debian way
RUN set -ex; \
RUN if [ "$DB_DISABLE_INCLUDED" = "false" ] ; then set -ex; \
{ \
echo "mariadb-server" mysql-server/root_password password '${DB_ROOT_PASSWORD}'; \
echo "mariadb-server" mysql-server/root_password_again password '${DB_ROOT_PASSWORD}'; \
@ -28,9 +29,9 @@ RUN set -ex; \
; \
find /etc/mysql/ -name '*.cnf' -print0 \
| xargs -0 grep -lZE '^(bind-address|log)' \
| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'
| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'; fi
RUN sed -ie "s/^bind-address\s*=\s*127\.0\.0\.1$/#bind-address = 0.0.0.0/" /etc/mysql/my.cnf
RUN if [ "$DB_DISABLE_INCLUDED" = "false" ] ; then sed -ie "s/^bind-address\s*=\s*127\.0\.0\.1$/#bind-address = 0.0.0.0/" /etc/mysql/my.cnf; fi
# Install FFmpeg