From 71fa5eb437264525bd59a4c23eb162892e947250 Mon Sep 17 00:00:00 2001 From: Volker Schukai <volker.schukai@schukai.com> Date: Sun, 22 Oct 2023 23:43:46 +0200 Subject: [PATCH] fix: ci pipeline --- .gitlab-ci.yml | 7 ++----- devenv.nix | 6 ++++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 993eb04..38e5939 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,7 @@ image: docker-registry.schukai.com:443/nixos-ci-devenv:latest services: - - name: docker:dind - command: ["--experimental", "--privileged"] + - docker:dind variables: # The repo name as used in @@ -18,7 +17,6 @@ variables: NIXPKGS_ALLOW_UNFREE: "1" NIXPKGS_ALLOW_INSECURE: "1" DOCKER_DRIVER: overlay2 - DOCKER_HOST: tcp://docker:2376 GIT_DEPTH: 10 stages: @@ -32,8 +30,7 @@ before_script: - variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done - cat .env-gitlab-ci - env - - echo $DOCKER_HOST - - nix shell nixpkgs#docker-client -c docker info + - docker info after_script: - if [ -f .env-gitlab-ci ]; then rm .env-gitlab-ci; fi diff --git a/devenv.nix b/devenv.nix index 2185cd4..a0d07ff 100644 --- a/devenv.nix +++ b/devenv.nix @@ -323,11 +323,13 @@ EOF - deploy before_script: - - nix shell nixpkgs#coreutils-full -c mkdir -p /certs/client/ - - nix shell nixpkgs#coreutils-full -c ln -fs /etc/ssl/certs/ca-bundle.crt /certs/client/ca.pem + - nix shell nixpkgs#coreutils -c mkdir -p /certs/client/ + - nix shell nixpkgs#coreutils -c ln -fs /etc/ssl/certs/ca-bundle.crt /certs/client/ca.pem - echo > .env-gitlab-ci - variables=("HOME=$HOME" "CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME" "CI_REPOSITORY_URL=$CI_REPOSITORY_URL" "GITLAB_TOKEN=$GITLAB_TOKEN" "CI_JOB_TOKEN=$CI_JOB_TOKEN" "GITLAB_USER_EMAIL=$GITLAB_USER_EMAIL" "GITLAB_USER_NAME=\"$GITLAB_USER_NAME\"" "CI_REGISTRY_USER=$CI_REGISTRY_USER" "CI_PROJECT_ID=$CI_PROJECT_ID" "CI_PROJECT_DIR=$CI_PROJECT_DIR" "CI_API_V4_URL=$CI_API_V4_URL" "CI_PROJECT_NAME=$CI_PROJECT_NAME" "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA"); for var in "''${variables[@]}"; do echo "$var" >> .env-gitlab-ci; done - cat .env-gitlab-ci + - env + - docker info after_script: - if [ -f .env-gitlab-ci ]; then rm .env-gitlab-ci; fi -- GitLab