Migrate docker image to bullseye

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dca22e680e188c22753de0cf5d333f855b25cb4..ad94c8cab9fc4aeb6f0f62242bca9210c42b0cb9 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,8 +56,8 @@ build-docker-develop:
   only:
     - schedules
   variables:
-    DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-buster
-    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster
+    DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-bullseye
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.bullseye
 
 build-docker-webserver:
   <<: *docker
@@ -72,13 +72,13 @@ build-docker-tag:
   only:
     - tags
   variables:
-    DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-buster
-    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster
+    DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-bullseye
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.bullseye
 
 build-docker-master:
   <<: *docker
   only:
     - master
   variables:
-    DOCKER_IMAGE_NAME: chocobozzz/peertube:production-buster
-    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster
+    DOCKER_IMAGE_NAME: chocobozzz/peertube:production-bullseye
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.bullseye

diff --git a/support/doc/docker.md b/support/doc/docker.md
index d83ee3997e7edf99a8c545a6834f9d72c39f8187..dd84937f3db2ae7093a10777179b790f59cbaac4 100644 (file)
--- a/support/doc/docker.md
+++ b/support/doc/docker.md
@@ -147,7 +147,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.buster
+$ docker build . -f ./support/docker/production/Dockerfile.bullseye
 ```
 
 ### Development

diff --git a/support/docker/production/Dockerfile.buster b/support/docker/production/Dockerfile.bullseye
similarity index 97%
rename from support/docker/production/Dockerfile.buster
rename to support/docker/production/Dockerfile.bullseye
index 163c514f5897de93175963530e611a3b1de6cd46..7b2650538022468120b6452dd3d2dcab943684a5 100644 (file)
--- a/support/docker/production/Dockerfile.buster
+++ b/support/docker/production/Dockerfile.bullseye
@@ -1,4 +1,4 @@
-FROM node:12-buster-slim
+FROM node:12-bullseye-slim
 
 # Allow to pass extra options to the npm run build
 # 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 6588337000756981d3f16d7faffb76131354375e..cf90b226ffbac437b75d67a42ec8eb563cf361f5 100644 (file)
--- 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.buster
-    image: chocobozzz/peertube:production-buster
+    #   dockerfile: ./support/docker/production/Dockerfile.bullseye
+    image: chocobozzz/peertube:production-bullseye
     # 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: