aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-11-16 17:03:44 +0100
committerChocobozzz <me@florianbigard.com>2021-11-16 17:03:44 +0100
commit1606ac207dd276dd2ad9971608ff7320d2b8ffeb (patch)
treebe240d8cd7a6d2bafe6fe8abaed9b577db41a4cd
parent9c7cf0072ffbfff7e1d3276af9123d9c5a3a0aa6 (diff)
downloadPeerTube-1606ac207dd276dd2ad9971608ff7320d2b8ffeb.tar.gz
PeerTube-1606ac207dd276dd2ad9971608ff7320d2b8ffeb.tar.zst
PeerTube-1606ac207dd276dd2ad9971608ff7320d2b8ffeb.zip
Migrate docker image to bullseye
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--support/doc/docker.md2
-rw-r--r--support/docker/production/Dockerfile.bullseye (renamed from support/docker/production/Dockerfile.buster)2
-rw-r--r--support/docker/production/docker-compose.yml4
4 files changed, 10 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dca22e68..ad94c8cab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,8 +56,8 @@ build-docker-develop:
56 only: 56 only:
57 - schedules 57 - schedules
58 variables: 58 variables:
59 DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-buster 59 DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-bullseye
60 DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster 60 DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.bullseye
61 61
62build-docker-webserver: 62build-docker-webserver:
63 <<: *docker 63 <<: *docker
@@ -72,13 +72,13 @@ build-docker-tag:
72 only: 72 only:
73 - tags 73 - tags
74 variables: 74 variables:
75 DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-buster 75 DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-bullseye
76 DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster 76 DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.bullseye
77 77
78build-docker-master: 78build-docker-master:
79 <<: *docker 79 <<: *docker
80 only: 80 only:
81 - master 81 - master
82 variables: 82 variables:
83 DOCKER_IMAGE_NAME: chocobozzz/peertube:production-buster 83 DOCKER_IMAGE_NAME: chocobozzz/peertube:production-bullseye
84 DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster 84 DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.bullseye
diff --git a/support/doc/docker.md b/support/doc/docker.md
index d83ee3997..dd84937f3 100644
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -147,7 +147,7 @@ $ docker-compose up -d
147```shell 147```shell
148$ git clone https://github.com/chocobozzz/PeerTube /tmp/peertube 148$ git clone https://github.com/chocobozzz/PeerTube /tmp/peertube
149$ cd /tmp/peertube 149$ cd /tmp/peertube
150$ docker build . -f ./support/docker/production/Dockerfile.buster 150$ docker build . -f ./support/docker/production/Dockerfile.bullseye
151``` 151```
152 152
153### Development 153### Development
diff --git a/support/docker/production/Dockerfile.buster b/support/docker/production/Dockerfile.bullseye
index 163c514f5..7b2650538 100644
--- a/support/docker/production/Dockerfile.buster
+++ b/support/docker/production/Dockerfile.bullseye
@@ -1,4 +1,4 @@
1FROM node:12-buster-slim 1FROM node:12-bullseye-slim
2 2
3# Allow to pass extra options to the npm run build 3# Allow to pass extra options to the npm run build
4# eg: --light --light-fr to not build all client languages 4# eg: --light --light-fr to not build all client languages
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index 658833700..cf90b226f 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.buster 47 # dockerfile: ./support/docker/production/Dockerfile.bullseye
48 image: chocobozzz/peertube:production-buster 48 image: chocobozzz/peertube:production-bullseye
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: