Merge pull request Nitrokey#82 from Nitrokey/CI

use custom docker img for CI
sgued · May 11, 2021 · ca58534 · ca58534
2 parents 474006e + dc06749
commit ca58534
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -11,12 +11,12 @@ variables:
 pull:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "trigger" && $CI_COMMIT_BRANCH == "master"'
-  image: ubuntu:20.04
+  image: nitrokey/pull:latest
   tags:
     - docker
   stage: pull-github
   before_script:
-    - apt-get install -y git
+    - apt-get update -y
   script:
     - chmod +x ./ci-scripts/pull.sh
     - ./ci-scripts/pull.sh
@@ -55,10 +55,9 @@ upload-nightly:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
   tags:
     - docker
-  image: nightly-upload:latest
+  image: nitrokey/nightly-upload:latest
   before_script:
     - apt-get update -y
-    - apt-get install -y git zip rsync
   script:
     - chmod +x ./ci-scripts/nightly_upload.sh
     - mkdir nightly-build
@@ -82,12 +81,12 @@ build-and-publish-pypi:
 publish-msi:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "web"'
-  image: ubuntu:20.04
+  image: nitrokey/publish-git:latest
   tags:
     - docker
   stage: deploy
-  script:
+  before_script:
     - apt-get update -y
-    - apt-get install -y git curl jq zip
+  script:
     - chmod +x ./ci-scripts/release.sh
     - ./ci-scripts/release.sh
diff --git a/ci-scripts/nightly_upload.sh b/ci-scripts/nightly_upload.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -euxo pipefail
+set -euo pipefail
 # nightly_upload: checks remote file for changes and uploads new version if necessary
 # Usage:
 # set scp(ssh) server with user and path

diff --git a/ci-scripts/pull.sh b/ci-scripts/pull.sh
@@ -13,10 +13,10 @@ done
 
 mkdir git-magic
 cd git-magic
-git clone --mirror https://github.com/LennardBoediger/mirror-test.git
-cd mirror-test.git
-git remote add --mirror=fetch secondary https://git.dotplex.com/lennard.boediger/mirror-test.git
-git remote set-url secondary https://oauth2:$GITLAB_REPO_KEY@git.dotplex.com/lennard.boediger/mirror-test.git
+git clone --mirror https://github.com/Nitrokey/pynitrokey.git
+cd pynitrokey.git
+git remote add --mirror=fetch secondary https://git.dotplex.com/Nitrokey/pynitrokey.git
+git remote set-url secondary https://oauth2:$GITLAB_REPO_KEY@git.dotplex.com/Nitrokey/pynitrokey.git
 git fetch origin
 git push secondary --tags