talkatu/builders

Add the registry name to all tags and use REGISTRY_* envvars instead of DOCKERHUB_*

2019-07-09, Gary Kramlich
ade5c465024f
Parents 2e7c5204536e
Children 9b9de5dcb5b5
Add the registry name to all tags and use REGISTRY_* envvars instead of DOCKERHUB_*
1 files changed, 13 insertions(+), 10 deletions(-)
  • +13 -10
    convey.yml
    • --- a/convey.yml Tue Jul 09 01:51:08 2019 -0500
    +++ b/convey.yml Tue Jul 09 01:56:11 2019 -0500
    @@ -1,6 +1,9 @@
    environment:
    - ARCH=amd64
    - REPO=talkatu/builders
    + - REGISTRY=docker.io
    + - REGISTRY_USERNAME
    + - REGISTRY_PASSWORD
    tasks:
    import:
    @@ -11,7 +14,7 @@
    build:
    type: docker/build
    dockerfile: Dockerfile.${DISTRO}-${VERSION}-${ARCH}
    - tag: ${REPO}:${DISTRO}-${VERSION}-${ARCH}
    + tag: ${REGISTRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    files:
    - ${FILES}
    labels:
    @@ -19,22 +22,22 @@
    publish:
    type: docker/push
    - image: ${REPO}:${DISTRO}-${VERSION}-${ARCH}
    + image: ${REGISTRY}/${REPO}:${DISTRO}-${VERSION}-${ARCH}
    login:
    type: docker/login
    - username: ${DOCKERHUB_USERNAME}
    - password: ${DOCKERHUB_PASSWORD}
    - server: docker.io
    + username: ${REGISTRY_USERNAME}
    + password: ${REGISTRY_PASSWORD}
    + server: ${REGISTRY}
    logout:
    type: docker/logout
    - server: docker.io
    + server: ${REGISTRY}
    build-target:
    type: docker/build
    dockerfile: Dockerfile.${TARGET}
    - tags: ${REPO}:${TARGET}
    + tags: ${REGISTRY}/${REPO}:${TARGET}
    files:
    - ${FILES}
    labels:
    @@ -42,7 +45,7 @@
    publish-target:
    type: docker/push
    - image: ${REPO}:${TARGET}
    + image: ${REGISTRY}/${REPO}:${TARGET}
    plans:
    @@ -110,14 +113,14 @@
    - tasks: [import, build-target]
    publish:
    - environment: [DOCKERHUB_USERNAME, DOCKERHUB_PASSWORD]
    + environment: [REGISTRY_USERNAME, REGISTRY_PASSWORD]
    stages:
    - tasks: [login, publish]
    - tasks: [logout]
    run: always
    publish-target:
    - environment: [DOCKERHUB_USERNAME, DOCKERHUB_PASSWORD]
    + environment: [REGISTRY_USERNAME, REGISTRY_PASSWORD]
    stages:
    - tasks: [login, publish-target]
    - tasks: [logout]