From 96fb0942d5649b759b30aa9e4168db35983dd12a Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Wed, 12 Aug 2020 13:26:14 +0100 Subject: [PATCH] ci: better hook --- .drone/.drone-home.yml | 1 + .drone/drone-home.yml | 6 +++--- git-hooks/pre-commit | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.drone/.drone-home.yml b/.drone/.drone-home.yml index c8692c2..c4ed070 100644 --- a/.drone/.drone-home.yml +++ b/.drone/.drone-home.yml @@ -77,6 +77,7 @@ steps: - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}" - cd docker-dind - echo "$${CA_CRT}" > CA_crt.crt + - echo "$${CA_CRT}" - docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind1 - docker push $${LOCAL_DOCKER_REGISTRY}docker:dind1 - docker logout $${LOCAL_DOCKER_REGISTRY} diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 8c2e14b..c4ed070 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -74,12 +74,12 @@ steps: image: docker:dind commands: - set -e - - sleep 15 - docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${LOCAL_REGISTRY_PASSWORD}" - cd docker-dind - echo "$${CA_CRT}" > CA_crt.crt - - docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind - - docker push $${LOCAL_DOCKER_REGISTRY}docker:dind + - echo "$${CA_CRT}" + - docker build . -t $${LOCAL_DOCKER_REGISTRY}docker:dind1 + - docker push $${LOCAL_DOCKER_REGISTRY}docker:dind1 - docker logout $${LOCAL_DOCKER_REGISTRY} environment: CA_CRT: diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit index d6ddd08..7161ae2 100755 --- a/git-hooks/pre-commit +++ b/git-hooks/pre-commit @@ -1,3 +1,3 @@ -drone jsonnet --source .drone/drone-home.jsonnet --target .drone/.drone-home.yml --stream \ +drone jsonnet --source .drone/drone-home.jsonnet --target .drone/drone-home.yml --stream \ && git add .drone/drone-home.yml \ && echo "jsonnet built" \ No newline at end of file