Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev
commit
23f710a206
|
|
@ -93,7 +93,6 @@ 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/
|
|
||||||
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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue