Skip to content

Commit 0181335

Browse files
committed
Commit logspout binary to repository; update Dockerfile reference and Makefile
Updated Makefile: - to have a stage/logspout target which copies the build output to the stage directory - to depend upon the stage/logspout when building the container - to force the OS/ARCH to be linux/amd64 (prevent Mac users from destroying the world) Updated Dockerfile: - ADDs from the stage location
1 parent 83a2ea8 commit 0181335

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM flynn/busybox
22
MAINTAINER Jeff Lindsay <progrium@gmail.com>
33

4-
ADD ./build/logspout /bin/logspout
4+
ADD ./stage/logspout /bin/logspout
55

66
ENV DOCKER unix:///tmp/docker.sock
77
ENV ROUTESPATH /mnt/routes

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
build/container: build/logspout Dockerfile
1+
build/container: stage/logspout Dockerfile
22
docker build --no-cache -t logspout .
33
touch build/container
44

55
build/logspout: *.go
6-
go build -o build/logspout
6+
GOOS=linux GOARCH=amd64 go build -o build/logspout
7+
8+
stage/logspout: build/logspout
9+
mkdir -p stage
10+
cp build/logspout stage/logspout
711

812
release:
913
docker tag logspout progrium/logspout

stage/logspout

7.13 MB
Binary file not shown.

0 commit comments

Comments
 (0)