grim/convey

Remove the workspace images as they're being removed

2019-07-27, Gary Kramlich
aef9401d6902
Parents 66f30f8e3cc8
Children 98c9b62946d8
Remove the workspace images as they're being removed
6 files changed, 0 insertions(+), 90 deletions(-)
  • +0 -12
    convey.yml
  • +0 -8
    images/workspace-tools/Dockerfile
  • +0 -5
    images/workspace-tools/README.md
  • +0 -53
    images/workspace-tools/zglob.go
  • +0 -7
    images/workspace/Dockerfile
  • +0 -5
    images/workspace/README.md
    • --- a/convey.yml Sat Jul 27 11:00:47 2019 -0500
    +++ b/convey.yml Sat Jul 27 11:25:20 2019 -0500
    @@ -96,16 +96,6 @@
    tag: convey/template
    files:
    - images/template/run.sh
    - build-image-workspace:
    - type: docker/build
    - dockerfile: images/workspace/Dockerfile
    - tag: convey/workspace
    - build-image-workspace-tools:
    - type: docker/build
    - dockerfile: images/workspace-tools/Dockerfile
    - tag: convey/workspace-tools
    - files:
    - - images/workspace-tools/zglob.go
    # debugging tasks
    debug-env:
    @@ -153,8 +143,6 @@
    tasks:
    - build-image-env
    - build-image-template
    - - build-image-workspace
    - - build-image-workspace-tools
    debug:
    stages:
    - tasks: [debug-env]
    --- a/images/workspace-tools/Dockerfile Sat Jul 27 11:00:47 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,8 +0,0 @@
    -FROM golang:latest
    -
    -# Install zglob for export task
    -COPY zglob.go /go/src/convey/zglob/main.go
    -RUN go get convey/zglob ./... && go install convey/zglob
    -
    -WORKDIR "/workspace"
    -CMD ["/bin/bash"]
    --- a/images/workspace-tools/README.md Sat Jul 27 11:00:47 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,5 +0,0 @@
    -# convey/workspace-tools
    -
    -The workspace-tools image is a collection of utilities used internally by Convey.
    -
    -This image should not be used directly by a task.
    --- a/images/workspace-tools/zglob.go Sat Jul 27 11:00:47 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,53 +0,0 @@
    -// Convey
    -// Copyright 2017 Yasuhiro Matsumoto
    -// Eric Fritz
    -
    -// Permission is hereby granted, free of charge, to any person obtaining a
    -// copy of this software and associated documentation files (the "Software"),
    -// to deal in the Software without restriction, including without limitation
    -// the rights to use, copy, modify, merge, publish, distribute, sublicense,
    -// and/or sell copies of the Software, and to permit persons to whom the
    -// Software is furnished to do so, subject to the following conditions:
    -
    -// The above copyright notice and this permission notice shall be included in
    -// all copies or substantial portions of the Software.
    -
    -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    -// DEALINGS IN THE SOFTWARE.
    -
    -package main
    -
    -import (
    - "fmt"
    - "os"
    -
    - "github.com/mattn/go-zglob"
    -)
    -
    -func search(pattern string) {
    - matches, err := zglob.Glob(pattern)
    - if err != nil {
    - if _, lErr := fmt.Fprintf(os.Stderr, "zglob: %s: %s\n", pattern, err); lErr != nil {
    - fmt.Printf("error writing to stderr: %s\n", lErr)
    - }
    -
    - os.Exit(1)
    - }
    -
    - for _, m := range matches {
    - if _, err := os.Stat(m); err == nil {
    - fmt.Println(m)
    - }
    - }
    -}
    -
    -func main() {
    - if len(os.Args) > 1 {
    - search(os.Args[1])
    - }
    -}
    --- a/images/workspace/Dockerfile Sat Jul 27 11:00:47 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,7 +0,0 @@
    -FROM scratch
    -
    -LABEL maintainer "Gary Kramlich <grim@reaperworld.com>"
    -
    -CMD ["empty"]
    -
    -VOLUME /workspace
    --- a/images/workspace/README.md Sat Jul 27 11:00:47 2019 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,5 +0,0 @@
    -# convey/workspace
    -
    -The workspace image is the image used for creating the workspace during convey runs.
    -
    -This image is not useful on it's own.