From 9f1116b2b16b6ba2a29e2a9129db5e662ceb8b96 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Mon, 23 Oct 2023 00:26:21 +0200
Subject: [PATCH] fix: ci pipeline

---
 .gitlab-ci.yml | 3 +--
 devenv.nix     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbf9a5a..be52d7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
   NIXPKGS_ALLOW_UNFREE: "1"
   NIXPKGS_ALLOW_INSECURE: "1"
   DOCKER_DRIVER: overlay2
-  DOCKER_HOST: tcp://dind:2375
+  DOCKER_HOST: unix:///var/run/docker.sock
   GIT_DEPTH: 10
 
 stages:
@@ -31,7 +31,6 @@ 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
-  - sleep 50000
   - nix shell nixpkgs#docker-client -c docker info
 
 after_script:
diff --git a/devenv.nix b/devenv.nix
index 9e795c2..6b7b441 100644
--- a/devenv.nix
+++ b/devenv.nix
@@ -316,7 +316,7 @@ EOF
       NIXPKGS_ALLOW_UNFREE: "1"
       NIXPKGS_ALLOW_INSECURE: "1"
       DOCKER_DRIVER: overlay2
-      DOCKER_HOST: tcp://dind:2375
+      DOCKER_HOST: unix:///var/run/docker.sock
       GIT_DEPTH: 10
 
     stages:
@@ -330,7 +330,6 @@ EOF
       - 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
-      - sleep 50000
       - nix shell nixpkgs#docker-client -c docker info
 
     after_script:
-- 
GitLab