grim/convey
Clone
Summary
Browse
Changes
Graph
Clean up a few more things that were missed when removing the extend task
2019-10-27, Gary Kramlich
7394b6bcd6bd
Clean up a few more things that were missed when removing the extend task
// Convey
// Copyright 2016-2018 Gary Kramlich <grim@reaperworld.com>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
// Package docker implements the docker task types.
package
docker
import
(
"hg.sr.ht/~grim/convey/exec"
"hg.sr.ht/~grim/convey/runtime"
"hg.sr.ht/~grim/convey/tasks"
)
var
(
// Tasks is a map of all docker tasks.
Tasks
=
map
[
string
]
tasks
.
Task
{
"build"
:
&
Build
{},
"login"
:
&
Login
{},
"logout"
:
&
Logout
{},
"pull"
:
&
Pull
{},
"push"
:
&
Push
{},
"remove"
:
&
Remove
{},
"run"
:
&
Run
{},
"tag"
:
&
Tag
{},
"environment"
:
&
Environment
{},
}
)
func
dockerCommand
(
cmdv
[]
string
,
rt
*
runtime
.
Runtime
)
[]
string
{
cmd
:=
exec
.
NewGenerator
()
cmd
.
Appendv
(
cmdv
)
// if we have a docker config prepend it first
if
rt
.
State
.
DockerConfig
!=
""
{
cmd
.
Prepend
(
"--config"
,
rt
.
State
.
DockerConfig
)
}
// finally prepend the actual docker command
cmd
.
Prepend
(
"docker"
)
return
cmd
.
Command
()
}
// Docker runs a docker command.
func
Docker
(
name
string
,
cmdv
[]
string
,
rt
*
runtime
.
Runtime
)
error
{
return
exec
.
Run
(
name
,
dockerCommand
(
cmdv
,
rt
),
rt
.
State
.
PlanTimeout
)
}
// DockerOutput runs a docker command but returns the output rather than
// outputting to the logger.
func
DockerOutput
(
name
string
,
cmdv
[]
string
,
rt
*
runtime
.
Runtime
)
(
string
,
string
,
error
)
{
return
exec
.
RunOutput
(
name
,
dockerCommand
(
cmdv
,
rt
),
rt
.
State
.
PlanTimeout
)
}