X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitlab-ci.yml;h=b02a2c4bc083318faad568a80feb2a57a74510f8;hb=d0a0fa429d4651710ed951a3c11af0219e408964;hp=3891187e86bf33d528a26e3602abe78f3d7d149e;hpb=12e8547f07d9ef28ede3141da11c8c3de8549f7e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3891187e8..b02a2c4bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,8 @@
-image: chocobozzz/peertube-ci:10
+image: chocobozzz/peertube-ci:14
 
 stages:
-  - build-and-lint
-  - test
   - clients
   - docker-nightly
-  - external-plugins
 
 cache:
   key: yarn
@@ -52,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
@@ -60,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
@@ -67,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
@@ -74,30 +81,4 @@ build-docker-master:
     - master
   variables:
     DOCKER_IMAGE_NAME: chocobozzz/peertube:production-buster
-
-test-external-plugins:
-  stage: external-plugins
-  only:
-    - schedules
-  services:
-    - name: postgres:9.6
-      alias: postgres
-    - name: redis:latest
-      alias: redis
-    - name: rroemhild/test-openldap
-      alias: ldap
-  variables:
-    POSTGRES_USER: peertube
-    POSTGRES_HOST_AUTH_METHOD: trust
-    REDIS_HOST: redis
-  artifacts:
-   expire_in: 1 day
-   paths:
-     - test*/logs
-   when: always
-  before_script:
-    - 'sed -i -z "s/database:\n  hostname: ''localhost''/database:\n  hostname: ''postgres''/" config/test.yaml'
-    - 'sed -i -z "s/redis:\n  hostname: ''localhost''/redis:\n  hostname: ''redis''/" config/test.yaml'
-    - NOCLIENT=1 yarn install --pure-lockfile --cache-folder .yarn-cache
-  script:
-    - PGHOST=postgres PGUSER=peertube npm run ci -- "external-plugins"
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster