From 1acb2e202d4329faa2331bcae469297471e62b97 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Thu, 6 Aug 2020 03:25:56 +0100 Subject: [PATCH] . --- .drone/drone-home.jsonnet | 8 ++++---- .drone/drone-home.yml | 24 ------------------------ 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index b8459d7..7eb4ee8 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -12,11 +12,11 @@ local publicSecrets = import 'lib/public-secrets.libsonnet'; disable: false, depth: 0, }, - trigger: { + /*trigger: { event: [ 'tag', ], - }, + },*/ services: [ images.docker { privileged: true, @@ -49,7 +49,7 @@ local publicSecrets = import 'lib/public-secrets.libsonnet'; '/stack/squid' ), images.wait(15), - images.docker { + /*images.docker { name +: 'build docker image:', environment +: environment.environmentSecrets([ 'LOCAL_DOCKER_REGISTRY', @@ -71,7 +71,7 @@ local publicSecrets = import 'lib/public-secrets.libsonnet'; 'docker push $${LOCAL_DOCKER_REGISTRY}squid', 'docker logout $${LOCAL_DOCKER_REGISTRY}', ], - }, + },*/ compose([ environment.envSet('local-docker-registry'), environment.envSet('local-registry-password'), diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 1290dda..3cc0611 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -29,26 +29,6 @@ steps: commands: - sleep 15 -- name: "dockerbuild docker image:" - image: docker:dind - commands: - - set -e - - pwd - - sleep 15 - - cd docker - - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}" - - docker build . -t $${LOCAL_DOCKER_REGISTRY}squid - - docker push $${LOCAL_DOCKER_REGISTRY}squid - - docker logout $${LOCAL_DOCKER_REGISTRY} - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - LOCAL_REGISTRY_PASSWORD: - from_secret: local-registry-password - volumes: - - name: dockersock - path: /var/run - - name: deploy squid image: appleboy/drone-ssh settings: @@ -105,8 +85,4 @@ volumes: host: path: /etc/docker/certs.d -trigger: - event: - - tag - ...