diff options
-rw-r--r-- | .gitlab-ci.yml | 8 | ||||
-rw-r--r-- | support/doc/docker.md | 2 | ||||
-rw-r--r-- | support/docker/production/Dockerfile.buster (renamed from support/docker/production/Dockerfile.stretch) | 0 | ||||
-rw-r--r-- | support/docker/production/docker-compose.yml | 4 |
4 files changed, 7 insertions, 7 deletions
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: | |||
107 | before_script: | 107 | before_script: |
108 | - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$CI_REGISTRY_AUTH\",\"email\":\"$CI_REGISTRY_EMAIL\"}}}" > /kaniko/.docker/config.json | 108 | - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$CI_REGISTRY_AUTH\",\"email\":\"$CI_REGISTRY_EMAIL\"}}}" > /kaniko/.docker/config.json |
109 | script: | 109 | script: |
110 | - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/support/docker/production/Dockerfile.stretch --destination $DOCKER_IMAGE_NAME | 110 | - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster --destination $DOCKER_IMAGE_NAME |
111 | 111 | ||
112 | build-docker-develop: | 112 | build-docker-develop: |
113 | <<: *docker | 113 | <<: *docker |
114 | only: | 114 | only: |
115 | - schedules | 115 | - schedules |
116 | variables: | 116 | variables: |
117 | DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-stretch | 117 | DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-buster |
118 | 118 | ||
119 | build-docker-tag: | 119 | build-docker-tag: |
120 | <<: *docker | 120 | <<: *docker |
121 | only: | 121 | only: |
122 | - tags | 122 | - tags |
123 | variables: | 123 | variables: |
124 | DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-stretch | 124 | DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-buster |
125 | 125 | ||
126 | build-docker-master: | 126 | build-docker-master: |
127 | <<: *docker | 127 | <<: *docker |
128 | only: | 128 | only: |
129 | - master | 129 | - master |
130 | variables: | 130 | variables: |
131 | DOCKER_IMAGE_NAME: chocobozzz/peertube:production-stretch | 131 | 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 | |||
81 | ```shell | 81 | ```shell |
82 | $ git clone https://github.com/chocobozzz/PeerTube /tmp/peertube | 82 | $ git clone https://github.com/chocobozzz/PeerTube /tmp/peertube |
83 | $ cd /tmp/peertube | 83 | $ cd /tmp/peertube |
84 | $ docker build . -f ./support/docker/production/Dockerfile.stretch | 84 | $ docker build . -f ./support/docker/production/Dockerfile.buster |
85 | ``` | 85 | ``` |
86 | 86 | ||
87 | ## Development | 87 | ## Development |
diff --git a/support/docker/production/Dockerfile.stretch b/support/docker/production/Dockerfile.buster index 32c5266c5..32c5266c5 100644 --- a/support/docker/production/Dockerfile.stretch +++ b/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: | |||
23 | # If you don't want to use the official image and build one from sources | 23 | # If you don't want to use the official image and build one from sources |
24 | # build: | 24 | # build: |
25 | # context: . | 25 | # context: . |
26 | # dockerfile: ./support/docker/production/Dockerfile.stretch | 26 | # dockerfile: ./support/docker/production/Dockerfile.buster |
27 | image: chocobozzz/peertube:production-stretch | 27 | image: chocobozzz/peertube:production-buster |
28 | env_file: | 28 | env_file: |
29 | - .env | 29 | - .env |
30 | # Traefik labels are suggested as an example for people using Traefik, | 30 | # Traefik labels are suggested as an example for people using Traefik, |