From f0d4befc074b0b439ead6faca945bee7b67a2cf2 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Sat, 6 May 2023 15:21:35 +0200 Subject: [PATCH] wip #5851 --- .docker/{build => build.sh} | 0 .docker/dev/{build => build.sh} | 0 .docker/dev/docker-compose.yml | 2 +- .docker/dev/{update => update.sh} | 6 +++--- .docker/docker-compose.yml | 2 +- .docker/images/php-dev/Dockerfile | 3 +-- .docker/images/php/Dockerfile | 2 +- .docker/{syncprodtodev => syncprodtodev.sh} | 0 .docker/{update => update.sh} | 6 +++--- .gitattributes | 2 ++ app/Console/Commands/UpdatePDFJSLibrary.php | 2 +- bin/{startup => startup.sh} | 0 scripts/{fixrights => fixrights.sh} | 0 scripts/{restartworkers => restartworkers.sh} | 0 scripts/{terser_path => terser_path.sh} | 0 scripts/{update => update.sh} | 4 ++-- scripts/{updatenpm => updatenpm.sh} | 0 scripts/{webvideo => webvideo.sh} | 0 18 files changed, 15 insertions(+), 14 deletions(-) rename .docker/{build => build.sh} (100%) rename .docker/dev/{build => build.sh} (100%) rename .docker/dev/{update => update.sh} (64%) rename .docker/{syncprodtodev => syncprodtodev.sh} (100%) rename .docker/{update => update.sh} (63%) rename bin/{startup => startup.sh} (100%) rename scripts/{fixrights => fixrights.sh} (100%) rename scripts/{restartworkers => restartworkers.sh} (100%) rename scripts/{terser_path => terser_path.sh} (100%) rename scripts/{update => update.sh} (91%) rename scripts/{updatenpm => updatenpm.sh} (100%) rename scripts/{webvideo => webvideo.sh} (100%) diff --git a/.docker/build b/.docker/build.sh similarity index 100% rename from .docker/build rename to .docker/build.sh diff --git a/.docker/dev/build b/.docker/dev/build.sh similarity index 100% rename from .docker/dev/build rename to .docker/dev/build.sh diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml index d4bcd73f4..e15993158 100644 --- a/.docker/dev/docker-compose.yml +++ b/.docker/dev/docker-compose.yml @@ -25,7 +25,7 @@ services: - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/' - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/' # Startup - - '/home/toolbox/dev/bin/startup:/usr/bin/startup' + - '/home/toolbox/dev/bin/startup.sh:/usr/bin/startup.sh' # SSH - '/home/toolbox/dev/.docker/config/ssh/root/:/root/.ssh/' - '/home/toolbox/dev/.docker/config/ssh/user/:/application/.ssh/' diff --git a/.docker/dev/update b/.docker/dev/update.sh similarity index 64% rename from .docker/dev/update rename to .docker/dev/update.sh index 00f61fc9e..724bf3917 100644 --- a/.docker/dev/update +++ b/.docker/dev/update.sh @@ -1,10 +1,10 @@ #!/bin/sh cd /docker/fluidbook-toolbox-dev -/home/toolbox/dev/scripts/fixrights +/home/toolbox/dev/scripts/fixrights.sh chown root:root /home/toolbox/dev/.docker/config/cron/host;ln -sf /home/toolbox/dev/.docker/config/cron/host /etc/cron.d/toolbox docker network create fluidbook-toolbox-dev docker compose down docker compose up -d -/home/toolbox/dev/scripts/fixrights -docker exec -it fluidbook-toolbox /application/scripts/update +/home/toolbox/dev/scripts/fixrights.sh +docker exec -it fluidbook-toolbox /application/scripts/update.sh diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 2bc802d7a..e1edce81a 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -25,7 +25,7 @@ services: - '/home/extranet/www/fluidbook/cache/unzip/:/application/storage/fluidbook/cache/unzip/' - '/data/toolbox/protected/fluidbookpublication/cache/:/application/protected/fluidbookpublication/cache/' # Startup - - '/home/toolbox/www/bin/startup:/usr/bin/startup' + - '/home/toolbox/www/bin/startup.sh:/usr/bin/startup.sh' # SSH - '/home/toolbox/www/.docker/config/ssh/root/:/root/.ssh/' - '/home/toolbox/www/.docker/config/ssh/user/:/application/.ssh/' diff --git a/.docker/images/php-dev/Dockerfile b/.docker/images/php-dev/Dockerfile index d7b69bd4f..9af96ec91 100644 --- a/.docker/images/php-dev/Dockerfile +++ b/.docker/images/php-dev/Dockerfile @@ -92,8 +92,7 @@ RUN pip3 install font-line RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 toolbox -COPY --chmod=0755 startup /usr/bin/startup -CMD exec /usr/bin/startup +CMD exec /usr/bin/startup.sh # Open up fcgi port EXPOSE 9000 diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile index 3ef19bf50..b2c74b1de 100644 --- a/.docker/images/php/Dockerfile +++ b/.docker/images/php/Dockerfile @@ -90,7 +90,7 @@ RUN pip3 install font-line RUN groupadd sudo;useradd -d /application -g 33 -G sudo -s /bin/bash -u 1001 toolbox -CMD exec /usr/bin/startup +CMD exec /usr/bin/startup.sh # Open up fcgi port EXPOSE 9000 diff --git a/.docker/syncprodtodev b/.docker/syncprodtodev.sh similarity index 100% rename from .docker/syncprodtodev rename to .docker/syncprodtodev.sh diff --git a/.docker/update b/.docker/update.sh similarity index 63% rename from .docker/update rename to .docker/update.sh index b55e01583..378ae0d8a 100644 --- a/.docker/update +++ b/.docker/update.sh @@ -1,9 +1,9 @@ #!/bin/sh cd /docker/fluidbook-toolbox -/home/toolbox/www/scripts/fixrights +/home/toolbox/www/scripts/fixrights.sh chown root:root /home/toolbox/www/.docker/config/cron/host;ln -sf /home/toolbox/www/.docker/config/cron/host /etc/cron.d/toolbox docker network create fluidbook-toolbox docker compose down docker compose up -d -/home/toolbox/www/scripts/fixrights -docker exec -it fluidbook-toolbox /application/scripts/update +/home/toolbox/www/scripts/fixrights.sh +docker exec -it fluidbook-toolbox /application/scripts/update.sh diff --git a/.gitattributes b/.gitattributes index 967315dd3..6051ca4ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,4 +2,6 @@ *.css linguist-vendored *.scss linguist-vendored *.js linguist-vendored +.sh text eol=lf +.bat text eol=crlf CHANGELOG.md export-ignore diff --git a/app/Console/Commands/UpdatePDFJSLibrary.php b/app/Console/Commands/UpdatePDFJSLibrary.php index 3036ac36e..3d0d43cfc 100644 --- a/app/Console/Commands/UpdatePDFJSLibrary.php +++ b/app/Console/Commands/UpdatePDFJSLibrary.php @@ -45,6 +45,6 @@ class UpdatePDFJSLibrary extends CubistCommand Files::str_replace('function _isValidProtocol(url) {', 'function _isValidProtocol(url) {return true;', [$path . '/build/pdf.js', $path . '/build/pdf.worker.js']); `cp -r $path $minpath`; - `/application/scripts/terser_path $minpath`; + `/application/scripts/terser_path.sh $minpath`; } } diff --git a/bin/startup b/bin/startup.sh similarity index 100% rename from bin/startup rename to bin/startup.sh diff --git a/scripts/fixrights b/scripts/fixrights.sh similarity index 100% rename from scripts/fixrights rename to scripts/fixrights.sh diff --git a/scripts/restartworkers b/scripts/restartworkers.sh similarity index 100% rename from scripts/restartworkers rename to scripts/restartworkers.sh diff --git a/scripts/terser_path b/scripts/terser_path.sh similarity index 100% rename from scripts/terser_path rename to scripts/terser_path.sh diff --git a/scripts/update b/scripts/update.sh similarity index 91% rename from scripts/update rename to scripts/update.sh index cebdac1c4..980b824b5 100644 --- a/scripts/update +++ b/scripts/update.sh @@ -13,8 +13,8 @@ php artisan fluidbook:player:updatesources php artisan cubist:magic:migrate php artisan cubist:magic:generate composer dump-autoload -sudo /application/scripts/restartworkers -/application/scripts/updatenpm +sudo /application/scripts/restartworkers.sh +/application/scripts/updatenpm.sh sudo chown -R 1001:33 /application/storage/framework sudo chown -R 1001:33 /application/storage/framework php artisan optimize:clear diff --git a/scripts/updatenpm b/scripts/updatenpm.sh similarity index 100% rename from scripts/updatenpm rename to scripts/updatenpm.sh diff --git a/scripts/webvideo b/scripts/webvideo.sh similarity index 100% rename from scripts/webvideo rename to scripts/webvideo.sh -- 2.39.5