From: Yehuda Deutsch <yeh@uda.co.il>
Date: Fri, 28 Jul 2023 17:10:26 +0000 (-0400)
Subject: Switch from debian bullseye to bookworm
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=f7882ca3eb3ac17610fdf70c7acec48fd53bbf12;p=github%2FChocobozzz%2FPeerTube.git

Switch from debian bullseye to bookworm
---

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index e7be01f51..6eb299cab 100644
--- 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 066451067..46eb9e56e 100644
--- 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 267d7f4eb..bcdef7a7f 100644
--- 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 13f75f222..1993c3979 100644
--- 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: