X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitlab-ci.yml;h=4759b0861181b50f06efdb7a0b6c77de136a07cd;hb=7d3316dc823106ac9cef53fc8e433af21ef49fb7;hp=8deb0769484931b23f8acf6bd959f666c68a6821;hpb=943fddfbbe5b3c04620b230d606bfd0f8a58f3ff;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8deb07694..4759b0861 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,8 @@
 image: chocobozzz/peertube-ci:10
 
 stages:
-  - build-and-lint
-  - test
   - clients
   - docker-nightly
-  - external-plugins
-
-#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'
-#  - if [[ $CI_JOB_STAGE == "test" ]]; then psql -c "create user peertube with password 'peertube';"; fi
-#  - NOCLIENT=1 yarn install --pure-lockfile --cache-folder .yarn-cache
 
 cache:
   key: yarn
@@ -19,73 +10,6 @@ cache:
     - .yarn-cache
     - cached-fixtures
 
-###
-## Jobs templates
-#
-#.build-and-lint: &build-and-lint
-#  stage: build-and-lint
-#
-#.tests: &tests
-#  stage: test
-#  dependencies:
-#    - build-server
-#  services:
-#    - name: postgres:9.6
-#      alias: postgres
-#    - name: redis:latest
-#      alias: redis
-#  variables:
-#    PGHOST: postgres
-#    PGUSER: postgres
-#    REDIS_HOST: redis
-#  artifacts:
-#    expire_in: 1 day
-#    paths:
-#      - test*/logs
-#    when: always
-#
-####
-### Build and lint
-##
-#build-server:
-#  <<: *build-and-lint
-#  artifacts:
-#    expire_in: 5h
-#    paths:
-#      - dist/
-#  script:
-#    - npm run build:server
-#
-#lint:
-#  <<: *build-and-lint
-#  script:
-#    - yarn install --pure-lockfile --cache-folder .yarn-cache
-#    - npm run ci -- "lint"
-#
-####
-### Tests
-#
-#test-misc:
-#  <<: *tests
-#  script:
-#    - yarn install --pure-lockfile --cache-folder .yarn-cache
-#    - npm run ci -- "misc"
-#
-#test-cli:
-#  <<: *tests
-#  retry:
-#    max: 1
-#  script:
-#    - npm run ci -- "cli"
-#
-#api:
-#  <<: *tests
-#  parallel: 4
-#  retry:
-#    max: 1
-#  script:
-#    - NODE_PENDING_JOB_WAIT=1000 npm run ci -- api-$CI_NODE_INDEX
-
 build-openapi-clients:
   stage: clients
   only:
@@ -125,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
@@ -133,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
@@ -140,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
@@ -147,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