From 18d9b7f572d93d377c7c40e4d27f680214e4439a Mon Sep 17 00:00:00 2001 From: Ian Fijolek Date: Fri, 9 Aug 2019 17:00:10 -0700 Subject: [PATCH] Add client and server builds --- .drone.yml | 81 +++++++++++++++++++++++++++++++++++++++++--- client/manifest.tmpl | 22 ++++++++++++ manifest.tmpl | 22 ------------ server/manifest.tmpl | 22 ++++++++++++ 4 files changed, 120 insertions(+), 27 deletions(-) create mode 100644 client/manifest.tmpl delete mode 100644 manifest.tmpl create mode 100644 server/manifest.tmpl diff --git a/.drone.yml b/.drone.yml index d510f26..6a2399f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,5 @@ kind: pipeline -name: publish to docker hub +name: publish client to docker hub trigger: event: @@ -14,7 +14,8 @@ steps: - name: push image - amd64 image: plugins/docker settings: - repo: iamthefij/dockamole + repo: iamthefij/dockamole-client + context: client auto_tag: true auto_tag_suffix: linux-amd64 username: @@ -25,7 +26,8 @@ steps: - name: push image - arm32v7 image: plugins/docker settings: - repo: iamthefij/dockamole + repo: iamthefij/dockamole-client + context: client auto_tag: true auto_tag_suffix: linux-arm32v7 username: @@ -39,7 +41,8 @@ steps: - name: push image - arm64 image: plugins/docker settings: - repo: iamthefij/dockamole + repo: iamthefij/dockamole-client + context: client auto_tag: true auto_tag_suffix: linux-arm64v8 username: @@ -53,7 +56,75 @@ steps: - name: publish manifest image: plugins/manifest settings: - spec: manifest.tmpl + spec: client/manifest.tmpl + auto_tag: true + ignore_missing: true + username: + from_secret: docker_username + password: + from_secret: docker_password + +--- + +kind: pipeline +name: publish server to docker hub + +trigger: + event: + - push + - tag + ref: + - refs/heads/master + - refs/tags/v* + +steps: + + - name: push image - amd64 + image: plugins/docker + settings: + repo: iamthefij/dockamole-server + context: server + auto_tag: true + auto_tag_suffix: linux-amd64 + username: + from_secret: docker_username + password: + from_secret: docker_password + + - name: push image - arm32v7 + image: plugins/docker + settings: + repo: iamthefij/dockamole-server + context: server + auto_tag: true + auto_tag_suffix: linux-arm32v7 + username: + from_secret: docker_username + password: + from_secret: docker_password + build_args: + - REPO=arm32v7 + - GOARCH=arm + + - name: push image - arm64 + image: plugins/docker + settings: + repo: iamthefij/dockamole-server + context: server + auto_tag: true + auto_tag_suffix: linux-arm64v8 + username: + from_secret: docker_username + password: + from_secret: docker_password + build_args: + - REPO=arm64v8 + - GOARCH=arm + + - name: publish manifest + image: plugins/manifest + settings: + spec: server/manifest.tmpl auto_tag: true ignore_missing: true username: diff --git a/client/manifest.tmpl b/client/manifest.tmpl new file mode 100644 index 0000000..b73abd6 --- /dev/null +++ b/client/manifest.tmpl @@ -0,0 +1,22 @@ +image: iamthefij/dockamole-client:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +{{#if build.tags}} +tags: +{{#each build.tags}} + - {{this}} +{{/each}} +{{/if}} +manifests: + - image: iamthefij/dockamole-client:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + platform: + architecture: amd64 + os: linux + - image: iamthefij/dockamole-client:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64v8 + platform: + architecture: arm64 + os: linux + variant: v8 + - image: iamthefij/dockamole-client:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm32v7 + platform: + architecture: arm + os: linux + variant: v7 diff --git a/manifest.tmpl b/manifest.tmpl deleted file mode 100644 index 9cd5dd6..0000000 --- a/manifest.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -image: iamthefij/dockamole:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} -{{#if build.tags}} -tags: -{{#each build.tags}} - - {{this}} -{{/each}} -{{/if}} -manifests: - - image: iamthefij/dockamole:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 - platform: - architecture: amd64 - os: linux - - image: iamthefij/dockamole:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64v8 - platform: - architecture: arm64 - os: linux - variant: v8 - - image: iamthefij/dockamole:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm32v7 - platform: - architecture: arm - os: linux - variant: v7 diff --git a/server/manifest.tmpl b/server/manifest.tmpl new file mode 100644 index 0000000..4d91e9b --- /dev/null +++ b/server/manifest.tmpl @@ -0,0 +1,22 @@ +image: iamthefij/dockamole-server:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +{{#if build.tags}} +tags: +{{#each build.tags}} + - {{this}} +{{/each}} +{{/if}} +manifests: + - image: iamthefij/dockamole-server:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + platform: + architecture: amd64 + os: linux + - image: iamthefij/dockamole-server:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64v8 + platform: + architecture: arm64 + os: linux + variant: v8 + - image: iamthefij/dockamole-server:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm32v7 + platform: + architecture: arm + os: linux + variant: v7