yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-03 09:49:20 +02:00
Code Issues Releases Wiki Activity

Move docker to trixie

Browse source
This commit is contained in:
Chocobozzz 2025-09-15 07:11:57 +02:00
parent 2d96b7191d
commit 729a58a860
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/docker.yml vendored
View file

@ -27,8 +27,8 @@ jobs:
# FIXME: https://github.com/actions/checkout/issues/290 # FIXME: https://github.com/actions/checkout/issues/290
git fetch --force --tags git fetch --force --tags
one="{ \"build-peertube\": true, \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bookworm\" }" one="{ \"build-peertube\": true, \"file\": \"./support/docker/production/Dockerfile\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-trixie,chocobozzz/peertube:develop\" }"
two="{ \"build-peertube\": true, \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bookworm,chocobozzz/peertube:$(git describe --abbrev=0)-bookworm\" }" two="{ \"build-peertube\": true, \"file\": \"./support/docker/production/Dockerfile\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bookworm,chocobozzz/peertube:$(git describe --abbrev=0)-bookworm\" }"
three="{ \"build-peertube\": false, \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }" three="{ \"build-peertube\": false, \"file\": \"./support/docker/production/Dockerfile.nginx\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube-webserver:latest\" }"
matrix="[$one,$two,$three]" matrix="[$one,$two,$three]"

2
support/doc/docker.md
View file

@ -172,7 +172,7 @@ docker compose up -d
```shell ```shell
git clone https://github.com/chocobozzz/PeerTube /tmp/peertube git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
cd /tmp/peertube cd /tmp/peertube
docker build . -f ./support/docker/production/Dockerfile.bookworm docker build . -f ./support/docker/production/Dockerfile
``` ```
### Development ### Development

4
support/docker/production/Dockerfile.bookworm → support/docker/production/Dockerfile
View file

@ -1,4 +1,4 @@
FROM node:20-bookworm-slim FROM node:20-trixie-slim
ARG ALREADY_BUILT=0 ARG ALREADY_BUILT=0
@ -8,6 +8,8 @@ RUN apt update \
&& gosu nobody true \ && gosu nobody true \
&& rm /var/lib/apt/lists/* -fR && rm /var/lib/apt/lists/* -fR
RUN npm install -g pnpm
# Node images hardcode the node uid to 1000 so that number is not available. # Node images hardcode the node uid to 1000 so that number is not available.
# The "peertube" user is created as a system account which selects a UID from # The "peertube" user is created as a system account which selects a UID from
# the range of SYS_UID_MIN to SYS_UID_MAX (-1 to 1000] and consistently # the range of SYS_UID_MIN to SYS_UID_MAX (-1 to 1000] and consistently

2
support/docker/production/docker-compose.yml
View file

@ -43,7 +43,7 @@ services:
# If you don't want to use the official image and build one from sources: # If you don't want to use the official image and build one from sources:
# build: # build:
# context: . # context: .
# dockerfile: ./support/docker/production/Dockerfile.bookworm # dockerfile: ./support/docker/production/Dockerfile
image: chocobozzz/peertube:production-bookworm image: chocobozzz/peertube:production-bookworm
# Use a static IP for this container because nginx does not handle proxy host change without reload # 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 # This container could be restarted on crash or until the postgresql database is ready for connection