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

Merge branch 'copy_configs_on_docker' into 'dev' 

not sure why this was commented out but it makes overriding config impossible

See merge request Shinobi-Systems/Shinobi!431
fix-timelapse-in-addstorage
Moe 2023-01-02 18:08:38 +00:00
parent 95eda7e07b 5fe48f5cd7
commit 6a8f9d77be
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -93,7 +93,7 @@ RUN npm i npm@latest -g && \
COPY ./Docker/pm2.yml ./ COPY ./Docker/pm2.yml ./
# Copy default configuration files # Copy default configuration files
# COPY ./config/conf.json ./config/super.json /home/Shinobi/ COPY ./config/conf.json ./config/super.json /home/Shinobi/
RUN chmod -f +x /home/Shinobi/Docker/init.sh RUN chmod -f +x /home/Shinobi/Docker/init.sh
RUN sed -i -e 's/\r//g' /home/Shinobi/Docker/init.sh RUN sed -i -e 's/\r//g' /home/Shinobi/Docker/init.sh
# RUN chmod -f +x /home/Shinobi/shinobi # RUN chmod -f +x /home/Shinobi/shinobi