X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitlab-ci.yml;h=9dca22e680e188c22753de0cf5d333f855b25cb4;hb=ebe9b6b3f32d8432980854a51d28a8fb88fe62e5;hp=358257209792a6f379ae56f76d02c0c4aeb62f4e;hpb=f9d2deae3a826b2f3fdcb6d0b29ef06f21a93c61;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 358257209..9dca22e68 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: chocobozzz/peertube-ci:10
+image: chocobozzz/peertube-ci:14
 
 stages:
   - clients
@@ -10,20 +10,20 @@ cache:
     - .yarn-cache
     - cached-fixtures
 
-build-openapi-clients:
-  stage: clients
-  only:
-    refs:
-      - master
-      - schedules
-    changes:
-      - support/doc/api/openapi.yaml
-  script:
-    - apt-get update -qq
-    - apt-get -yqqq install openjdk-8-jre
-    - yarn install --pure-lockfile
-    - scripts/openapi-peertube-version.sh
-    - scripts/openapi-clients.sh
+# build-openapi-clients:
+#   stage: clients
+#   only:
+#     refs:
+#       - master
+#       - schedules
+#     changes:
+#       - support/doc/api/openapi.yaml
+#   script:
+#     - apt-get update -qq
+#     - apt-get -yqqq install openjdk-8-jre
+#     - yarn install --pure-lockfile
+#     - scripts/openapi-peertube-version.sh
+#     - scripts/openapi-clients.sh
 
 build-nightly:
   stage: docker-nightly
@@ -49,7 +49,7 @@ build-nightly:
     - mkdir -p /kaniko/.docker
     - 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.buster --destination $DOCKER_IMAGE_NAME
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $DOCKERFILE --destination $DOCKER_IMAGE_NAME
 
 build-docker-develop:
   <<: *docker
@@ -57,6 +57,15 @@ build-docker-develop:
     - schedules
   variables:
     DOCKER_IMAGE_NAME: chocobozzz/peertube:develop-buster
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster
+
+build-docker-webserver:
+  <<: *docker
+  only:
+    - schedules
+  variables:
+    DOCKER_IMAGE_NAME: chocobozzz/peertube-webserver
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.nginx
 
 build-docker-tag:
   <<: *docker
@@ -64,6 +73,7 @@ build-docker-tag:
     - tags
   variables:
     DOCKER_IMAGE_NAME: chocobozzz/peertube:$CI_COMMIT_TAG-buster
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster
 
 build-docker-master:
   <<: *docker
@@ -71,3 +81,4 @@ build-docker-master:
     - master
   variables:
     DOCKER_IMAGE_NAME: chocobozzz/peertube:production-buster
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster