From c82bf36a3f61fe051a2ead506a6f7b90d083bb32 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 12 Dec 2019 09:49:31 +0100 Subject: [PATCH] Docker: stretch -> buster --- .gitlab-ci.yml | 8 ++++---- support/doc/docker.md | 2 +- .../production/{Dockerfile.stretch => Dockerfile.buster} | 0 support/docker/production/docker-compose.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename support/docker/production/{Dockerfile.stretch => Dockerfile.buster} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d903f77ea..e9c1898f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,25 +107,25 @@ build-nightly: before_script: - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$CI_REGISTRY_AUTH\",\"email\":\"$CI_REGISTRY_EMAIL\"}}}" > /kaniko/.docker/config.json script: - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/support/docker/production/Dockerfile.stretch --destination $DOCKER_IMAGE_NAME + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster --destination $DOCKER_IMAGE_NAME build-docker-develop: <<: *docker only: - schedules variables: - DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-stretch + DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-buster build-docker-tag: <<: *docker only: - tags variables: - DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-stretch + DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-buster build-docker-master: <<: *docker only: - master variables: - DOCKER_IMAGE_NAME: chocobozzz/peertube:production-stretch + DOCKER_IMAGE_NAME: chocobozzz/peertube:production-buster diff --git a/support/doc/docker.md b/support/doc/docker.md index 4dd1eab4a..1b6f4abc3 100644 --- a/support/doc/docker.md +++ b/support/doc/docker.md @@ -81,7 +81,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.stretch +$ docker build . -f ./support/docker/production/Dockerfile.buster ``` ## Development diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.buster similarity index 100% rename from support/docker/production/Dockerfile.stretch rename to support/docker/production/Dockerfile.buster diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml index 9f6c47eca..b81a8745b 100644 --- a/support/docker/production/docker-compose.yml +++ b/support/docker/production/docker-compose.yml @@ -23,8 +23,8 @@ services: # If you don't want to use the official image and build one from sources # build: # context: . - # dockerfile: ./support/docker/production/Dockerfile.stretch - image: chocobozzz/peertube:production-stretch + # dockerfile: ./support/docker/production/Dockerfile.buster + image: chocobozzz/peertube:production-buster env_file: - .env # Traefik labels are suggested as an example for people using Traefik,