grim/convey

Parents b0a62de6249f
Children caf085767116
Update all examples and test configuration files for the type attribute change.
--- a/convey.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/convey.yml Sun Jan 07 02:57:01 2018 -0600
@@ -4,49 +4,55 @@
tasks:
# tasks for the default plan
import:
- type: import
+ type: docker/import
files:
- .
export:
- type: export
+ type: docker/export
files:
- convey-${CONVEY_VERSION}-alpine-amd64
- convey-${CONVEY_VERSION}-linux-amd64
- convey-${CONVEY_VERSION}-windows-amd64.exe
- convey-${CONVEY_VERSION}-darwin-amd64
clean:
- type: clean
+ type: convey/clean
files:
- convey-*
- '**/junit.xml'
go-test:
+ type: docker/run
image: convey/go-test:latest
command: -cover -sweet.opt "junit.output=junit.xml"
export-junit:
- type: export
+ type: docker/export
files:
- '**/junit.xml'
go-vet:
+ type: docker/run
image: convey/go-vet:latest
build-linux:
+ type: docker/run
image: convey/go-build:latest
command: -o convey-${CONVEY_VERSION}-linux-amd64
environment:
- GOOS=linux
- GOARCH=amd64
build-alpine:
+ type: docker/run
image: convey/go-build:alpine
command: -o convey-${CONVEY_VERSION}-alpine-amd64
environment:
- GOOS=linux
- GOARCH=amd64
build-windows:
+ type: docker/run
image: convey/go-build:latest
command: -o convey-${CONVEY_VERSION}-windows-amd64.exe
environment:
- GOOS=windows
- GOARCH=amd64
build-darwin:
+ type: docker/run
image: convey/go-build:latest
command: -o convey-${CONVEY_VERSION}-darwin-amd64
environment:
@@ -55,17 +61,19 @@
# tasks for the deploy plan
import-release:
- type: import
+ type: docker/import
files:
- convey-${CONVEY_VERSION}-alpine-amd64
- convey-${CONVEY_VERSION}-linux-amd64
- convey-${CONVEY_VERSION}-windows-amd64.exe
- convey-${CONVEY_VERSION}-darwin-amd64
create-checksums:
+ type: docker/run
image: convey/checksum
environment:
- 'SHA256_FILES="convey-${CONVEY_VERSION}-linux-amd64 convey-${CONVEY_VERSION}-windows-amd64.exe convey-${CONVEY_VERSION}-darwin-amd64 convey-${CONVEY_VERSION}-alpine-amd64"'
deploy-to-bitbucket:
+ type: docker/run
image: convey/bitbucket-upload
environment:
- BITBUCKET_REPO=rw_grim/convey
@@ -75,67 +83,67 @@
# tasks for creating images
import-images:
- type: import
+ type: docker/import
files:
- images
build-image-bitbucket-upload:
- type: build
+ type: docker/build
dockerfile: images/bitbucket-upload/Dockerfile
files:
- images/bitbucket-upload/run.sh
tag: convey/bitbucket-upload
build-image-checksum:
- type: build
+ type: docker/build
dockerfile: images/checksum/Dockerfile
tag: convey/checksum
files:
- images/checksum/run.sh
build-image-env:
- type: build
+ type: docker/build
dockerfile: images/env/Dockerfile
tag: convey/env
build-image-go-build:
- type: build
+ type: docker/build
dockerfile: images/go-build/Dockerfile
tag: convey/go-build
files:
- images/go-build/run.sh
build-image-go-build-alpine:
- type: build
+ type: docker/build
dockerfile: images/go-build-alpine/Dockerfile
tag: convey/go-build:alpine
files:
- images/go-build-alpine/run.sh
build-image-go-test:
- type: build
+ type: docker/build
dockerfile: images/go-test/Dockerfile
tag: convey/go-test
files:
- images/go-test/run.sh
build-image-go-vet:
- type: build
+ type: docker/build
dockerfile: images/go-vet/Dockerfile
tag: convey/go-vet:latest
files:
- images/go-vet/run.sh
build-image-rust-build-linux:
- type: build
+ type: docker/build
dockerfile: images/rust-build-linux/Dockerfile
tag: convey/rust-build-linux
files:
- images/rust-build-linux/run.sh
build-image-template:
- type: build
+ type: docker/build
dockerfile: images/template/Dockerfile
tag: convey/template
files:
- images/template/run.sh
build-image-workspace:
- type: build
+ type: docker/build
dockerfile: images/workspace/Dockerfile
tag: convey/workspace
build-image-workspace-tools:
- type: build
+ type: docker/build
dockerfile: images/workspace-tools/Dockerfile
tag: convey/workspace-tools
files:
@@ -143,7 +151,9 @@
# debugging tasks
debug-env:
+ type: docker/run
image: convey/env
+
plans:
# the default build plan
default:
--- a/examples/base.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/base.yml Sun Jan 07 02:57:01 2018 -0600
@@ -8,9 +8,11 @@
tasks:
one:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo "$PREFIX one"
two:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo "$PREFIX two"
--- a/examples/bitbucket-upload.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/bitbucket-upload.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,13 +1,14 @@
tasks:
# define a task to import your files to upload into the workspace
import:
- type: import
+ type: docker/import
files:
- .
# define the upload task itself. Be sure to set your repo and auth user.
# Never set BITBUCKET_AUTH_PASSWORD in your convey files that are going into
# version control!
upload:
+ type: docker/run
image: convey/bitbucket-upload
environment:
- BITBUCKET_REPO=rw_grim/bb-testing
--- a/examples/default-plan-alias.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/default-plan-alias.yml Sun Jan 07 02:57:01 2018 -0600
@@ -2,6 +2,7 @@
default-plan: not-the-default
tasks:
true:
+ type: docker/run
image: gliderlabs/alpine:edge
command: true
plans:
--- a/examples/detach-health.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/detach-health.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,8 +1,10 @@
tasks:
normal:
+ type: docker/run
image: nginx:alpine
detach: true
health-check:
+ type: docker/run
image: nginx:alpine
detach: true
healthcheck:
--- a/examples/detach.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/detach.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,5 +1,6 @@
tasks:
background:
+ type: docker/run
image: alpine:edge
command: sleep 300
detach: true
--- a/examples/disabled-stage.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/disabled-stage.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,8 +1,10 @@
tasks:
true:
+ type: docker/run
image: gliderlabs/alpine:edge
command: true
false:
+ type: docker/run
image: gliderlabs/alpine:edge
command: false
--- a/examples/environment-from-file.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/environment-from-file.yml Sun Jan 07 02:57:01 2018 -0600
@@ -22,10 +22,11 @@
tasks:
import:
- type: import
+ type: docker/import
files: .
generate:
+ type: docker/run
image: gliderlabs/alpine:edge
script:
- echo "foo=1" >> env
@@ -34,11 +35,12 @@
workdir: /workspace
inject:
- type: environment
+ type: docker/environment
from-file: env
prefix: "X_"
print:
+ type: docker/run
image: gliderlabs/alpine:edge
script:
- echo "X_FOO=${X_FOO}"
--- a/examples/environment.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/environment.yml Sun Jan 07 02:57:01 2018 -0600
@@ -3,6 +3,7 @@
- VERSION=1.2.3
tasks:
script:
+ type: docker/run
image: gliderlabs/alpine:edge
shell: /bin/ash
script:
--- a/examples/extend-slices.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/extend-slices.yml Sun Jan 07 02:57:01 2018 -0600
@@ -7,12 +7,12 @@
tasks:
tag-abstract:
- type: tag
+ type: docker/tag
source: gliderlabs/alpine:edge
destinations: ${IMAGE_TAGS}
tag-intermediate:
- type: extend
+ type: convey/extend
task: tag-abstract
environment:
- IMAGE_TAGS=foo;bar;baz
@@ -20,7 +20,7 @@
- IMAGE_TAGS
tag-concrete:
- type: extend
+ type: convey/extend
task: tag-intermediate
environment:
- IMAGE_TAGS=baz;bonk
--- a/examples/extend.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/extend.yml Sun Jan 07 02:57:01 2018 -0600
@@ -4,19 +4,20 @@
tasks:
foo:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo "${MESSAGE}"
environment:
- MESSAGE=foo
bar:
- type: extend
+ type: convey/extend
task: foo
environment:
- MESSAGE=bar
baz:
- type: extend
+ type: convey/extend
task: bar
environment:
- MESSAGE=baz
--- a/examples/extends-merge.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/extends-merge.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,4 +1,4 @@
-# This plan extends another plan by overwriting the pre and post
+# This plan extends another plan by overwriting the pre and post
# stages of a plan defined in the parent config. This shows how
# to build "abstract" plans which can be extended in ways that
# allow blocks of plans to be replaced.
@@ -10,9 +10,11 @@
tasks:
before:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo "<= before"
after:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo "=> after"
--- a/examples/extends.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/extends.yml Sun Jan 07 02:57:01 2018 -0600
@@ -9,9 +9,11 @@
tasks:
two:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo "${PREFIX} TWO"
three:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo "${PREFIX} three"
--- a/examples/login-logout.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/login-logout.yml Sun Jan 07 02:57:01 2018 -0600
@@ -4,12 +4,12 @@
- DOCKER_PASSWORD=password
tasks:
login:
- type: login
+ type: docker/login
server: ${DOCKER_REGISTRY}
username: ${DOCKER_USERNAME}
password: ${DOCKER_PASSWORD}
logout:
- type: logout
+ type: docker/logout
server: ${DOCKER_REGISTRY}
plans:
default:
--- a/examples/metaplans.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/metaplans.yml Sun Jan 07 02:57:01 2018 -0600
@@ -6,9 +6,11 @@
tasks:
one:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo one
two:
+ type: docker/run
image: gliderlabs/alpine:edge
command: echo two
@@ -23,7 +25,7 @@
- two
meta-plans:
- everything:
+ default:
plans:
- plan1
- plan2
--- a/examples/override.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/override.yml Sun Jan 07 02:57:01 2018 -0600
@@ -8,6 +8,7 @@
- source=global-normal
tasks:
env:
+ type: docker/run
image: convey/env
environment:
- source=task
--- a/examples/script.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/script.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,6 +1,7 @@
tasks:
# define our script task
script:
+ type: docker/run
image: gliderlabs/alpine:edge
# if you need to override the default shell of /bin/sh you can use the
# shell attribute
--- a/examples/ssh-identities.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/ssh-identities.yml Sun Jan 07 02:57:01 2018 -0600
@@ -3,6 +3,7 @@
- '*'
tasks:
dump-env:
+ type: docker/run
image: convey/env
plans:
default:
--- a/examples/stage-run.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/stage-run.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,20 +1,24 @@
tasks:
fail:
+ type: docker/run
image: gliderlabs/alpine:edge
schell: /bin/sh
script:
- false
success:
+ type: docker/run
image: gliderlabs/alpine:edge
shell: /bin/sh
script:
- echo "success"
failure:
+ type: docker/run
image: gliderlabs/alpine:edge
shell: /bin/sh
script:
- echo "failure"
cleanup:
+ type: docker/run
image: gliderlabs/alpine:edge
shell: /bin/sh
script:
--- a/examples/traditional.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/examples/traditional.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,17 +1,24 @@
tasks:
clone-source:
+ type: docker/run
image: rwgrim/docker-noop
run-linter:
+ type: docker/run
image: rwgrim/docker-noop
run-tests:
+ type: docker/run
image: rwgrim/docker-noop
build:
+ type: docker/run
image: rwgrim/docker-noop
deploy-dev:
+ type: docker/run
image: rwgrim/docker-noop
deploy-docs:
+ type: docker/run
image: rwgrim/docker-noop
report-build-status:
+ type: docker/run
image: rwgrim/docker-noop
plans:
default:
--- a/tests/breakout.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/tests/breakout.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,15 +1,15 @@
tasks:
import-bad:
- type: import
+ type: docker/import
files: /etc/ssl:/ssl
import:
- type: import
+ type: docker/import
files: breakout.yml
export-bad:
- type: export
+ type: docker/export
files: breakout.yml:/
export:
- type: export
+ type: docker/export
files: breakout.yml:qux/quux/free.yml
plans:
default:
--- a/tests/multi-stage/convey.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/tests/multi-stage/convey.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,23 +1,25 @@
tasks:
import:
- type: import
+ type: docker/import
files: .
build-left:
- type: build
+ type: docker/build
dockerfile: Dockerfile
target: multi-stage-left
tags: multi-stage-left
build-right:
- type: build
+ type: docker/build
dockerfile: Dockerfile
target: multi-stage-right
tags: multi-stage-right
run-left:
+ type: docker/run
image: multi-stage-left
run-right:
+ type: docker/run
image: multi-stage-right
cleanup:
- type: remove
+ type: docker/remove
images:
- multi-stage-left
- multi-stage-right
--- a/tests/slow.yml Sun Jan 07 02:38:04 2018 -0600
+++ b/tests/slow.yml Sun Jan 07 02:57:01 2018 -0600
@@ -1,5 +1,6 @@
tasks:
slow:
+ type: docker/run
image: alpine:edge
script: sleep 5