gplugin/builders

Make the clean task just clean the current image and add a clean-target task/plan

2019-06-18, Gary Kramlich
5429d77ba5d4
Parents 60b58ff3eeb6
Children ce4468a02c98
Make the clean task just clean the current image and add a clean-target task/plan
1 files changed, 14 insertions(+), 12 deletions(-)
  • +14 -12
    convey.yml
    • --- a/convey.yml Tue Jun 18 22:46:59 2019 -0500
    +++ b/convey.yml Tue Jun 18 22:52:07 2019 -0500
    @@ -15,14 +15,7 @@
    type: docker/remove
    quiet: true
    images:
    - - ${REGSITRY}/${REPO}:alpine-edge-amd64
    - - ${REGISTRY}/${REPO}:coverity
    - - ${REGISTRY}/${REPO}:debian-stretch-amd64
    - - ${REGISTRY}/${REPO}:debian-buster-amd64
    - - ${REGISTRY}/${REPO}:fedora-28-amd64
    - - ${REGISTRY}/${REPO}:fedora-29-amd64
    - - ${REGISTRY}/${REPO}:opensuse-tumbleweed-amd64
    - - ${REGISTRY}/${REPO}:ubuntu-bionic-amd64
    + - ${REGSITRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    build:
    type: docker/build
    @@ -37,6 +30,11 @@
    type: docker/push
    image: ${REGISTRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    + clean-target:
    + type: docker/remove
    + images:
    + - ${REGISTRY}/${REPO}:${TARGET}
    +
    build-target:
    type: docker/build
    dockerfile: Dockerfile.${TARGET}
    @@ -93,10 +91,6 @@
    stages:
    - tasks: [import, build]
    - build-target:
    - stages:
    - - tasks: [import, build-target]
    -
    publish:
    environment: [DOCKERHUB_USERNAME, DOCKERHUB_PASSWORD]
    stages:
    @@ -104,6 +98,14 @@
    - tasks: [logout]
    run: always
    + clean-target:
    + stages:
    + - tasks: [clean-target]
    +
    + build-target:
    + stages:
    + - tasks: [import, build-target]
    +
    publish-target:
    environment: [REGISTRY, REGISTRY_USERNAME, REGISTRY_PASSWORD]
    stages: