pidgin/builders

Make the release-2.x.y builds look more like the default ones so the ci builds are easier to deal with
release-2.x.y
2020-12-14, Gary Kramlich
991a9103fb1e
Parents bee41f51c514
Children 4efe191f6ea2
Make the release-2.x.y builds look more like the default ones so the ci builds are easier to deal with
1 files changed, 8 insertions(+), 9 deletions(-)
  • +8 -9
    convey.yml
    • --- a/convey.yml Mon Dec 14 22:09:45 2020 -0600
    +++ b/convey.yml Mon Dec 14 22:38:36 2020 -0600
    @@ -3,7 +3,7 @@
    - REPO=pidgin/builders-2
    - REGISTRY_USERNAME
    - REGISTRY_PASSWORD
    - - REGISTRY_HOST=docker.io
    + - REGISTRY=docker.io
    tasks:
    import:
    @@ -13,26 +13,25 @@
    build:
    type: docker/build
    - dockerfile: Dockerfile.${DISTRO}-${VERSION}-${ARCH}
    - tag: ${REGISTRY_HOST}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    - files:
    - - ${FILES}
    + dockerfile: Dockerfile.${TARGET}
    + tag: ${REGISTRY}/${REPO}:${TARGET}
    + files: .:.
    labels:
    - COMMIT=${HG_COMMIT}
    publish:
    type: docker/push
    - image: ${REGISTRY_HOST}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    + image: ${REGISTRY}/${REPO}:${TARGET}
    login:
    type: docker/login
    username: ${REGISTRY_USERNAME}
    password: ${REGISTRY_PASSWORD}
    - server: ${REGISTRY_HOST}
    + server: ${REGISTRY}
    logout:
    type: docker/logout
    - server: ${REGISTRY_HOST}
    + server: ${REGISTRY}
    clean:
    type: docker/remove
    @@ -41,7 +40,7 @@
    plans:
    debian-buster-amd64:
    - environment: [DISTRO=debian, VERSION=buster, FILES=simple]
    + environment: TARGET=debian-buster-amd64
    stages:
    - tasks: [import, build]