From c062d2fa25143c27e1051b8f145f891c4ec40237 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 14 Oct 2020 16:34:44 +0200 Subject: [PATCH] fix pipeline dependencies --- .drone.jsonnet | 3 --- .drone.yml | 22 ++-------------------- README.md | 7 ++++++- docker/Dockerfile | 2 ++ 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index e21d83d..aab1228 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -44,7 +44,6 @@ local PipelineBuildContainer(arch='amd64') = { username: { from_secret: 'docker_username' }, password: { from_secret: 'docker_password' }, }, - depends_on: ['build'], when: { ref: ['refs/pull/**'], }, @@ -63,7 +62,6 @@ local PipelineBuildContainer(arch='amd64') = { when: { ref: ['refs/heads/master', 'refs/tags/**'], }, - depends_on: ['dryrun'], }, { name: 'publish-quay', @@ -80,7 +78,6 @@ local PipelineBuildContainer(arch='amd64') = { when: { ref: ['refs/heads/master', 'refs/tags/**'], }, - depends_on: ['dryrun'], }, ], depends_on: [ diff --git a/.drone.yml b/.drone.yml index 7c08c87..c8cc096 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,8 +45,6 @@ steps: when: ref: - refs/pull/** - depends_on: - - build - name: publish-dockerhub image: plugins/docker:18-linux-amd64 @@ -63,8 +61,6 @@ steps: ref: - refs/heads/master - refs/tags/** - depends_on: - - dryrun - name: publish-quay image: plugins/docker:18-linux-amd64 @@ -82,8 +78,6 @@ steps: ref: - refs/heads/master - refs/tags/** - depends_on: - - dryrun trigger: ref: @@ -116,8 +110,6 @@ steps: when: ref: - refs/pull/** - depends_on: - - build - name: publish-dockerhub image: plugins/docker:18-linux-arm64 @@ -134,8 +126,6 @@ steps: ref: - refs/heads/master - refs/tags/** - depends_on: - - dryrun - name: publish-quay image: plugins/docker:18-linux-arm64 @@ -153,8 +143,6 @@ steps: ref: - refs/heads/master - refs/tags/** - depends_on: - - dryrun trigger: ref: @@ -187,8 +175,6 @@ steps: when: ref: - refs/pull/** - depends_on: - - build - name: publish-dockerhub image: plugins/docker:18-linux-arm @@ -205,8 +191,6 @@ steps: ref: - refs/heads/master - refs/tags/** - depends_on: - - dryrun - name: publish-quay image: plugins/docker:18-linux-arm @@ -224,8 +208,6 @@ steps: ref: - refs/heads/master - refs/tags/** - depends_on: - - dryrun trigger: ref: @@ -282,7 +264,7 @@ steps: DOCKER_USER: from_secret: docker_username PUSHRM_FILE: README.md - PUSHRM_SHORT: Another best practice scanner for Ansible roles and playbooks + PUSHRM_SHORT: Poor-mans docker service synchronizer PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME} when: status: @@ -332,6 +314,6 @@ depends_on: --- kind: signature -hmac: 55bd4e5dec1d0b85685be44ea471cd34a611ebfc491bd8a6d1b5018a37556429 +hmac: ed7dce0d14be5798a9e179b1561bda835b2ef28ef73dd537213c289fbd356800 ... diff --git a/README.md b/README.md index c576e2c..f46ab69 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,12 @@ # wait-for +Poor-mans docker service synchronizer + [![Build Status](https://img.shields.io/drone/build/thegeeklab/wait-for?logo=drone)](https://cloud.drone.io/thegeeklab/wait-for) +[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/wait-for) +[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/wait-for) [![GitHub contributors](https://img.shields.io/github/contributors/thegeeklab/wait-for)](https://github.com/thegeeklab/wait-for/graphs/contributors) +[![Source: GitHub](https://img.shields.io/badge/source-github-blue.svg?logo=github&logoColor=white)](https://github.com/thegeeklab/wait-for) [![License: MIT](https://img.shields.io/github/license/thegeeklab/wait-for)](https://github.com/thegeeklab/wait-for/blob/master/LICENSE) wait-for is a script designed to synchronize services like docker containers. It is [sh](https://en.wikipedia.org/wiki/Bourne_shell) and [alpine](https://alpinelinux.org/) compatible. It was inspired by [vishnubob/wait-for-it](https://github.com/vishnubob/wait-for-it), but the core has been rewritten at [Eficode](http://eficode.com/) by [dsuni](https://github.com/dsuni) and [mrako](https://github.com/mrako). @@ -24,7 +29,7 @@ optional arguments: ## Dependencies -* Installed Netcat +- Installed Netcat ## Examples diff --git a/docker/Dockerfile b/docker/Dockerfile index 0ed96ea..d908457 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,6 +8,8 @@ LABEL maintainer="Robert Kaussow " \ ADD wait-for /usr/local/bin/wait-for +RUN apk --no-cache netcat-openbsd + USER root CMD [] ENTRYPOINT ["/usr/local/bin/wait-for"]