borekon/PeerTube_original
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from debian bullseye to bookworm

Browse Source
This commit is contained in:
Yehuda Deutsch 2023-07-28 13:10:26 -04:00 committed by Chocobozzz
parent a5bde7ad60
commit f7882ca3eb
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,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="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bullseye\" }" one="{ \"file\": \"./support/docker/production/Dockerfile.bookworm\", \"ref\": \"develop\", \"tags\": \"chocobozzz/peertube:develop-bookworm\" }"
two="{ \"file\": \"./support/docker/production/Dockerfile.bullseye\", \"ref\": \"master\", \"tags\": \"chocobozzz/peertube:production-bullseye,chocobozzz/peertube:$(git describe --abbrev=0)-bullseye\" }" 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\" }" three="{ \"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

@ -165,7 +165,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.bullseye docker build . -f ./support/docker/production/Dockerfile.bookworm
``` ```
### Development ### Development

2
support/docker/production/Dockerfile.bullseye → support/docker/production/Dockerfile.bookworm
View File

@ -1,4 +1,4 @@
FROM node:16-bullseye-slim FROM node:16-bookworm-slim
# Install dependencies # Install dependencies
RUN apt update \ RUN apt update \

4
support/docker/production/docker-compose.yml
View File

@ -44,8 +44,8 @@ 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.bullseye # dockerfile: ./support/docker/production/Dockerfile.bookworm
image: chocobozzz/peertube:production-bullseye 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
networks: networks: