diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38e01b03c91643257521ae329b31a2363e41da4c..fc6addcad71394c1df6022e0671fe3859340cb37 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,8 +26,10 @@ stages: before_script: # - unset DOCKER_TLS_VERIFY + - nix shell nixpkgs#coreutils -c ls -lah /certs/client/ - 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 + - nix shell nixpkgs#coreutils -c ls -lah /certs/client/ - 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 diff --git a/devenv.nix b/devenv.nix index 4fb5ef36fdac693e6f531db5e840039c5cba4043..52e632e14def621a4cd6d52841ff8136fd701379 100644 --- a/devenv.nix +++ b/devenv.nix @@ -325,8 +325,10 @@ stages: before_script: # - unset DOCKER_TLS_VERIFY + - nix shell nixpkgs#coreutils -c ls -lah /certs/client/ - 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 + - nix shell nixpkgs#coreutils -c ls -lah /certs/client/ - 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 diff --git a/runnable-sftp_test.go b/runnable-sftp_test.go index d0ac05b5a2aae73386462c6d2576a062ddb3eb30..0f0c999950097b65a76f39bd6907bb7c2a5f7fee 100644 --- a/runnable-sftp_test.go +++ b/runnable-sftp_test.go @@ -8,6 +8,7 @@ import ( "github.com/docker/docker/client" "github.com/docker/go-connections/nat" "github.com/stretchr/testify/assert" + "io" "net" "os" "testing" @@ -30,7 +31,7 @@ func startSFTPTestDockerImageAndContainer(t *testing.T, host string, port string } //if debug image pull, comment out the following lines - //_, _ = io.Copy(os.Stdout, reader) + _, _ = io.Copy(os.Stdout, reader) _ = reader hostConfig := &container.HostConfig{