Switch from debian bullseye to bookworm

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e7be01f51afc1cdc096940d675d5509f238161f2..6eb299cab7468a07945428966fba640c8f2d7637 100644 (file)
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -24,8 +24,8 @@ jobs:
           # FIXME: https://github.com/actions/checkout/issues/290
           git fetch --force --tags
 
-          one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\" }"
-          two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\" }"
+          one="{ \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bookworm\" }"
+          two="{ \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bookworm,chocobozzz/peertube:$(git describe --abbrev=0)-bookworm\" }"
           three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }"
 
           matrix="[$one,$two,$three]"

diff --git a/support/doc/docker.md b/support/doc/docker.md
index 066451067a1ca19ecb3c36196c219a1f413acb3e..46eb9e56e29242ef87391c323c8c2bf9834c04d0 100644 (file)
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -165,7 +165,7 @@ docker compose up -d
 ```shell
 git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
 cd /tmp/peertube
-docker build . -f ./support/docker/production/Dockerfile.bullseye
+docker build . -f ./support/docker/production/Dockerfile.bookworm
 ```
 
 ### Development

diff --git a/support/docker/production/Dockerfile.bullseye b/support/docker/production/Dockerfile.bookworm
similarity index 97%
rename from support/docker/production/Dockerfile.bullseye
rename to support/docker/production/Dockerfile.bookworm
index 267d7f4eb4c3e240d041592ca5a93b11254a0b3d..bcdef7a7f413993dc61dc503c3dc88f4c87be69c 100644 (file)
--- a/support/docker/production/Dockerfile.bullseye
+++ b/support/docker/production/Dockerfile.bookworm
@@ -1,4 +1,4 @@
-FROM node:16-bullseye-slim
+FROM node:16-bookworm-slim
 
 # Install dependencies
 RUN apt update \

diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 13f75f2221e8b11b688fb76f8f79eca115cf52e9..1993c39799cfea748b12b92c11ab482ebce8edc6 100644 (file)
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -44,8 +44,8 @@ services:
     # If you don't want to use the official image and build one from sources:
     # build:
     #   context: .
-    #   dockerfile: ./support/docker/production/Dockerfile.bullseye
-    image: chocobozzz/peertube:production-bullseye
+    #   dockerfile: ./support/docker/production/Dockerfile.bookworm
+    image: chocobozzz/peertube:production-bookworm
     # Use a static IP for this container because nginx does not handle proxy host change without reload
     # This container could be restarted on crash or until the postgresql database is ready for connection
     networks: