diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 395bc21..618a3b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,8 @@ variables: NEXUS_PULL_REGISTRY: "10.15.39.186:8082" NEXUS_PUSH_REGISTRY: "10.15.39.186:8082" IMAGE_NAME: "eosbpkd/sidata" - DOCKER_HOST: "tcp://docker:2375" - DOCKER_TLS_CERTDIR: "" + DOCKER_HOST: "tcp://docker:2376" + DOCKER_TLS_CERTDIR: "/certs" build_image: stage: build @@ -15,9 +15,6 @@ build_image: services: - name: 10.15.39.186:8082/library/docker:24.0.5-dind alias: docker - command: - - "--host=tcp://0.0.0.0:2375" - - "--insecure-registry=10.15.39.186:8082" before_script: - until docker info >/dev/null 2>&1; do echo "Waiting for docker daemon..."; sleep 1; done script: @@ -25,21 +22,6 @@ build_image: - docker build -t $NEXUS_PUSH_REGISTRY/$IMAGE_NAME:$CI_COMMIT_SHA -t $NEXUS_PUSH_REGISTRY/$IMAGE_NAME:latest . - docker push $NEXUS_PUSH_REGISTRY/$IMAGE_NAME:$CI_COMMIT_SHA - docker push $NEXUS_PUSH_REGISTRY/$IMAGE_NAME:latest - only: - - main - - master - - fix/sidata-path - -deploy_rancher: - stage: deploy - image: 10.15.39.186:8082/library/alpine/helm:3.12.0 - script: - - mkdir -p ~/.kube - - echo "$KUBECONFIG_B64" | base64 -d > ~/.kube/config - - helm upgrade --install sidata ./helm/sidata \ - --namespace default \ - --set image.repository=$NEXUS_PUSH_REGISTRY/$IMAGE_NAME \ - --set image.tag=$CI_COMMIT_SHA only: - main - master