Skip to content

Commit

Permalink
use explicit output
Browse files Browse the repository at this point in the history
  • Loading branch information
vito committed Jan 30, 2016
1 parent c3ffee9 commit 929503e
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 8 deletions.
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
FROM busybox
ADD built-check /opt/resource/check
ADD built-in /opt/resource/in
ADD built-out /opt/resource/out
ADD assets/ /opt/resource/
7 changes: 5 additions & 2 deletions build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ platform: linux
image: docker:///concourse/static-golang

inputs:
- name: time-resource
path: gopath/src/github.com/concourse/time-resource
- name: time-resource
path: gopath/src/github.com/concourse/time-resource

outputs:
- name: built-resource

run:
path: gopath/src/github.com/concourse/time-resource/scripts/ci
9 changes: 6 additions & 3 deletions scripts/build
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

go build -o built-in in/main.go
go build -o built-check check/main.go
go build -o built-out out/main.go
set -e -u -x

mkdir -p assets
go build -o assets/in in/main.go
go build -o assets/check check/main.go
go build -o assets/out out/main.go
4 changes: 4 additions & 0 deletions scripts/ci
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ set -eu
export GOPATH=$PWD/gopath
export PATH=$GOPATH/bin:$PATH

BUILD_DIR=$PWD/built-resource

cd $GOPATH/src/github.com/concourse/time-resource

export GOPATH=${PWD}/Godeps/_workspace:$GOPATH
Expand All @@ -16,3 +18,5 @@ go install github.com/onsi/ginkgo/ginkgo
CGO_ENABLED=1 ginkgo -race -r -p "$@"

./scripts/build

cp -a assets/ Dockerfile $BUILD_DIR

0 comments on commit 929503e

Please sign in to comment.