grim/convey

Merge doc update.
auto-split
2017-09-25, Eric Fritz
6a57cb62056e
Parents 1882c463e358
Children 4a815329a019
Merge doc update.
8 files changed, 40 insertions(+), 10 deletions(-)
  • +1 -0
    .hgtags
  • +5 -2
    ChangeLog
  • +2 -2
    REFERENCE.md
  • +1 -1
    convey.yml
  • +6 -3
    docker/login.go
  • +4 -1
    docker/logout.go
  • +20 -0
    examples/login-logout.yml
  • +1 -1
    main.go
    • --- a/.hgtags Mon Sep 25 20:11:36 2017 -0500
    +++ b/.hgtags Mon Sep 25 20:31:04 2017 -0500
    @@ -10,3 +10,4 @@
    5561b6335876739fc27a588a6f3683637b9c9643 v0.7.0
    48e8fd45b85665b7d1f9b53b67f7084c18d48617 v0.8.0
    2e75ab88da21edadfc9a00f1ed0f311bfcf5c95b v0.9.0
    +86643e4fda896fe633a00cc1bc0ada851b4e3300 v0.9.1
    --- a/ChangeLog Mon Sep 25 20:11:36 2017 -0500
    +++ b/ChangeLog Mon Sep 25 20:31:04 2017 -0500
    @@ -1,5 +1,8 @@
    -0.9.1:
    - * Nothing yet... Be the first!!
    +0.9.2:
    + * Added new task type "extend" (Eric Fritz) (Fixed #124)
    +
    +0.9.1: 20170921
    + * Added environment mapping support to the login and logout tasks.
    0.9.0: 20170917
    * Updated the import and export tasks to allow a string for the files field
    --- a/REFERENCE.md Mon Sep 25 20:11:36 2017 -0500
    +++ b/REFERENCE.md Mon Sep 25 20:31:04 2017 -0500
    @@ -1,4 +1,4 @@
    -# Configuration
    +# Configuration
    Configuring convey is done via a file named `convey.yml`. This file defines the tasks as well as the plans. This document explains how that file is structured and what options are available.
    @@ -146,7 +146,7 @@
    informal-greeting:
    type: extend
    - task: base
    + task: greeting
    environment:
    - MESSAGE="Hi!"
    --- a/convey.yml Mon Sep 25 20:11:36 2017 -0500
    +++ b/convey.yml Mon Sep 25 20:31:04 2017 -0500
    @@ -1,5 +1,5 @@
    environment:
    - - CONVEY_VERSION=0.9.1dev
    + - CONVEY_VERSION=0.9.2dev
    - GO_PACKAGE=bitbucket.org/rw_grim/convey
    tasks:
    # tasks for the default plan
    --- a/docker/login.go Mon Sep 25 20:11:36 2017 -0500
    +++ b/docker/login.go Mon Sep 25 20:31:04 2017 -0500
    @@ -20,6 +20,7 @@
    import (
    "github.com/aphistic/gomol"
    + "bitbucket.org/rw_grim/convey/environment"
    "bitbucket.org/rw_grim/convey/state"
    "bitbucket.org/rw_grim/convey/tasks"
    )
    @@ -33,10 +34,12 @@
    const loginTemplate = `login -u {{.username}} -p {{.password}}{{if .server}} {{.server}}{{end}}`
    func (l *Login) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    + fullEnv := environment.Merge(env, st.Environment)
    +
    params := map[string]interface{}{
    - "username": l.Username,
    - "password": l.Password,
    - "server": l.Server,
    + "username": environment.Mapper(l.Username, fullEnv),
    + "password": environment.Mapper(l.Password, fullEnv),
    + "server": environment.Mapper(l.Server, fullEnv),
    }
    return Docker(name, loginTemplate, params, st)
    --- a/docker/logout.go Mon Sep 25 20:11:36 2017 -0500
    +++ b/docker/logout.go Mon Sep 25 20:31:04 2017 -0500
    @@ -20,6 +20,7 @@
    import (
    "github.com/aphistic/gomol"
    + "bitbucket.org/rw_grim/convey/environment"
    "bitbucket.org/rw_grim/convey/state"
    "bitbucket.org/rw_grim/convey/tasks"
    )
    @@ -31,8 +32,10 @@
    const logoutTemplate = `logout{{if .server}} {{.server}}{{end}}`
    func (l *Logout) Execute(name string, logger *gomol.LogAdapter, env []string, st *state.State) error {
    + fullEnv := environment.Merge(env, st.Environment)
    +
    params := map[string]interface{}{
    - "server": l.Server,
    + "server": environment.Mapper(l.Server, fullEnv),
    }
    return Docker(name, logoutTemplate, params, st)
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/examples/login-logout.yml Mon Sep 25 20:31:04 2017 -0500
    @@ -0,0 +1,20 @@
    +environment:
    + - DOCKER_REGISTRY=registry
    + - DOCKER_USERNAME=username
    + - DOCKER_PASSWORD=password
    +tasks:
    + login:
    + type: login
    + server: ${DOCKER_REGISTRY}
    + username: ${DOCKER_USERNAME}
    + password: ${DOCKER_PASSWORD}
    + logout:
    + type: logout
    + server: ${DOCKER_REGISTRY}
    +plans:
    + default:
    + stages:
    + - tasks:
    + - login
    + - logout
    +
    --- a/main.go Mon Sep 25 20:11:36 2017 -0500
    +++ b/main.go Mon Sep 25 20:31:04 2017 -0500
    @@ -36,7 +36,7 @@
    )
    const (
    - version = "0.9.1dev"
    + version = "0.9.2dev"
    )
    var (