wip #7340 @0.25

diff --git a/Dockerfile b/Dockerfile
index dbdc28f1856cb7a0f42844d0525b88034bdff3a0..22b87a931b1cfebc1e695aba5f5847c47af48a3f 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM ubuntu:jammy
+FROM ubuntu:noble
 WORKDIR "/application"
 
 ENV TERM=linux
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y --no-install-recommends gnupg \
-    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
+    && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ondrej-php.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C \
     && apt-get update \
-    && apt-get -y --no-install-recommends install x11-common pdftk poppler-utils ghostscript netpbm sshfs mupdf-tools php8.2-cli php8.2-fpm php8.2-curl php8.2-exif php8.2-xml php8.2-gd php8.2-ssh php8.2-zip libjpeg-turbo-progs zip unzip \
+    && apt-get -y --no-install-recommends install x11-common pdftk poppler-utils ghostscript netpbm sshfs mupdf-tools php8.4-cli php8.4-fpm php8.4-curl php8.4-exif php8.4-xml php8.4-gd php8.4-ssh php8.4-zip libjpeg-turbo-progs zip unzip \
         less nano wget bash lynx rsync
 
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer

diff --git a/app/composer.json b/app/composer.json
index b427218438c423b8c71737ad9187bea1197f498e..83079fdedee9186491092ccc51c72527467a7371 100644 (file)
--- a/app/composer.json
+++ b/app/composer.json
@@ -22,7 +22,7 @@
   },
   "prefer-stable": true,
   "require": {
-    "php": ">=8.2",
+    "php": ">=8.4",
     "fluidbook/tools": "dev-master"
   }
 }
\ No newline at end of file

diff --git a/docker-compose.yml b/docker-compose.yml
index 5e81b416fd029c753fbddd0a1f75f569b0683724..2c94dca1ab29c52f351f72e5329c70e8a7a75607 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.1'
 services:
   php:
     container_name: fluidbook-processfarm
@@ -10,8 +9,8 @@ services:
     volumes:
       - './app/:/application/'
       - './ssh/:/root/.ssh/'
-      - './php/fpm.conf:/etc/php/8.2/fpm/pool.d/z-overrides.conf'
-      - './php/php.ini:/etc/php/8.2/fpm/conf.d/99-overrides.ini'
+      - './php/fpm.conf:/etc/php/8.4/fpm/pool.d/z-overrides.conf'
+      - './php/php.ini:/etc/php/8.4/fpm/conf.d/99-overrides.ini'
       - '/etc/hostname:/etc/hostname:ro'
     tmpfs:
       - /tmp
@@ -21,7 +20,9 @@ services:
     privileged: true
     networks:
       - fluidbook-processfarm
+
+
 networks:
   fluidbook-processfarm:
-    external:
-      name: fluidbook-processfarm
\ No newline at end of file
+    name: fluidbook-processfarm
+    external: true
\ No newline at end of file

diff --git a/startup b/startup
index bd32200605b2c07cc484f8e46aa0eff4689fdf7b..2d7f891313cb3de472944a603ea5ddcb7cf0c669 100755 (executable)
--- a/startup
+++ b/startup
@@ -1,3 +1,3 @@
 #!/bin/sh
 /application/bin/mount
-/usr/sbin/php-fpm8.2 -O
\ No newline at end of file
+/usr/sbin/php-fpm8.4 -O
\ No newline at end of file

diff --git a/update b/update
index 322fed0d0f17770cfba39d050859f58fa3776862..e6d01a3d8eba91937ff6842bf8aeb74e39cd512d 100755 (executable)
--- a/update
+++ b/update
@@ -1,20 +1,9 @@
 #!/bin/bash
 cd /docker/fluidbook-processfarm
-docker network create fluidbook-processfarm
 git config --global --add safe.directory /docker/fluidbook-processfarm
 git fetch --all
 git reset --hard origin/master
 git stash
 git pull origin master
-chmod 755 ./app/bin/*
-chmod 755 ./ssh
-chmod 600 ./ssh/id_rsa
-DOCKER_BUILDKIT=1 docker compose build
-docker compose down -v
-docker compose up -d
-#docker exec fluidbook-processfarm apt update
-#docker exec fluidbook-processfarm apt upgrade -y
-docker exec fluidbook-processfarm composer update
-chmod 755 ./app/vendor/cubist/pdf/resources/tools/fwstk.sh
-chmod 755 ./app/vendor/fluidbook/tools/resources/tools/svgcleaner/svgcleaner
-if command -v ufw-docker &> /dev/null; then ufw-docker allow fluidbook-processfarm; fi
\ No newline at end of file
+chmod 755 ./updatecontainer
+./updatecontainer
\ No newline at end of file

diff --git a/updatecontainer b/updatecontainer
new file mode 100644 (file)
index 0000000..873e479
--- /dev/null
+++ b/updatecontainer
@@ -0,0 +1,15 @@
+#!/bin/bash
+cd /docker/fluidbook-processfarm
+docker network create fluidbook-processfarm
+chmod 755 ./app/bin/*
+chmod 755 ./ssh
+chmod 600 ./ssh/id_rsa
+DOCKER_BUILDKIT=1 docker compose build
+docker compose down -v
+docker compose up -d
+#docker exec fluidbook-processfarm apt update
+#docker exec fluidbook-processfarm apt upgrade -y
+docker exec fluidbook-processfarm composer update
+chmod 755 ./app/vendor/cubist/pdf/resources/tools/fwstk.sh
+chmod 755 ./app/vendor/fluidbook/tools/resources/tools/svgcleaner/svgcleaner
+if command -v ufw-docker &> /dev/null; then ufw-docker allow fluidbook-processfarm; fi
\ No newline at end of file