aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYehuda Deutsch <yeh@uda.co.il>2023-07-28 13:10:26 -0400
committerChocobozzz <chocobozzz@cpy.re>2023-08-17 15:18:21 +0200
commitf7882ca3eb3ac17610fdf70c7acec48fd53bbf12 (patch)
tree2f1d5f71282ede081867c6922387cd10d7267128
parenta5bde7ad60fcbd0bcf5c9de01b624c3113493856 (diff)
downloadPeerTube-f7882ca3eb3ac17610fdf70c7acec48fd53bbf12.tar.gz
PeerTube-f7882ca3eb3ac17610fdf70c7acec48fd53bbf12.tar.zst
PeerTube-f7882ca3eb3ac17610fdf70c7acec48fd53bbf12.zip
Switch from debian bullseye to bookworm
-rw-r--r--.github/workflows/docker.yml4
-rw-r--r--support/doc/docker.md2
-rw-r--r--support/docker/production/Dockerfile.bookworm (renamed from support/docker/production/Dockerfile.bullseye)2
-rw-r--r--support/docker/production/docker-compose.yml4
4 files changed, 6 insertions, 6 deletions
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:
24 # FIXME: https://github.com/actions/checkout/issues/290 24 # FIXME: https://github.com/actions/checkout/issues/290
25 git fetch --force --tags 25 git fetch --force --tags
26 26
27 one="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\" }" 27 one="{ \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bookworm\" }"
28 two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\" }" 28 two="{ \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bookworm,chocobozzz/peertube:$(git describe --abbrev=0)-bookworm\" }"
29 three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }" 29 three="{ \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }"
30 30
31 matrix="[$one,$two,$three]" 31 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
165```shell 165```shell
166git clone https://github.com/chocobozzz/PeerTube /tmp/peertube 166git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
167cd /tmp/peertube 167cd /tmp/peertube
168docker build . -f ./support/docker/production/Dockerfile.bullseye 168docker build . -f ./support/docker/production/Dockerfile.bookworm
169``` 169```
170 170
171### Development 171### Development
diff --git a/support/docker/production/Dockerfile.bullseye b/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 @@
1FROM node:16-bullseye-slim 1FROM node:16-bookworm-slim
2 2
3# Install dependencies 3# Install dependencies
4RUN apt update \ 4RUN 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:
44 # If you don't want to use the official image and build one from sources: 44 # If you don't want to use the official image and build one from sources:
45 # build: 45 # build:
46 # context: . 46 # context: .
47 # dockerfile: ./support/docker/production/Dockerfile.bullseye 47 # dockerfile: ./support/docker/production/Dockerfile.bookworm
48 image: chocobozzz/peertube:production-bullseye 48 image: chocobozzz/peertube:production-bookworm
49 # Use a static IP for this container because nginx does not handle proxy host change without reload 49 # Use a static IP for this container because nginx does not handle proxy host change without reload
50 # This container could be restarted on crash or until the postgresql database is ready for connection 50 # This container could be restarted on crash or until the postgresql database is ready for connection
51 networks: 51 networks: