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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 64c818476..4759b0861 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,90 +1,15 @@
 image: chocobozzz/peertube-ci:10
 
 stages:
-  - build-and-lint
-  - test
   - clients
   - docker-nightly
 
-#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
   paths:
     - .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:
@@ -93,7 +18,7 @@ build-openapi-clients:
       - schedules
     changes:
       - support/doc/api/openapi.yaml
-  script: 
+  script:
     - apt-get update -qq
     - apt-get -yqqq install openjdk-8-jre
     - yarn install --pure-lockfile
@@ -121,9 +46,10 @@ build-nightly:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
   before_script:
+    - 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
@@ -131,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
@@ -138,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
@@ -145,3 +81,4 @@ build-docker-master:
     - master
   variables:
     DOCKER_IMAGE_NAME: chocobozzz/peertube:production-buster
+    DOCKERFILE: $CI_PROJECT_DIR/support/docker/production/Dockerfile.buster