Merge pull request #56 from seeker89/docker-push-updates

Updates for the docker images being pushed to docker.io

.dockerignore

@@ -1,2 +1 @@
 .git/
-/vendor/

.travis.yml

@@ -25,6 +25,11 @@ script:
   - docker images
   - docker run `make version` --help
 
+  # build an image with the vendor folder
+  - make clean && make vendor && make vendor-build
+  - docker images
+  - docker run `make version`-vendor --help
+
 deploy:
   provider: script
   script: bash docker_deploy.sh

Dockerfile

@@ -21,5 +21,4 @@ RUN make bin/goldpinger
 FROM scratch
 COPY --from=builder /go/src/github.com/bloomberg/goldpinger/bin/goldpinger /goldpinger
 COPY ./static /static
-ENTRYPOINT ["/goldpinger", "--static-file-path", "/static"]
-
+ENTRYPOINT ["/goldpinger", "--static-file-path", "/static"]

Makefile

@@ -42,4 +42,15 @@ run:
 version:
 	@echo $(tag)
 
-.PHONY: clean vendor swagger build build-multistage tag push run version
+
+vendor-build:
+	docker build -t $(tag)-vendor --build-arg TAG=$(tag) -f ./build/Dockerfile-vendor .
+
+vendor-tag:
+	docker tag $(tag)-vendor $(namespace)$(tag)-vendor
+
+vendor-push:
+	docker push $(namespace)$(tag)-vendor
+
+
+.PHONY: clean vendor swagger build build-multistage vendor-build vendor-tag vendor-push tag push run version

README.md

@@ -38,11 +38,20 @@ If you'd like to know more, you can watch [our presentation at Kubecon 2018 Seat
 
 ## Quick start
 
+Getting from sources:
+
 ```sh
 go get github.com/bloomberg/goldpinger/cmd/goldpinger
 goldpinger --help
 ```
 
+Getting from [docker hub](https://hub.docker.com/r/bloomberg/goldpinger):
+
+```sh
+# get from docker hub
+docker pull bloomberg/goldpinger
+```
+
 Note, that in order to guarantee correct versions of dependencies, the project [uses `dep`](./Makefile).
 
 
@@ -105,8 +114,6 @@ namespace="docker.io/myhandle/" make push
 
 Here's an example of what you can do (using the in-cluster authentication to `Kubernetes` apiserver). 
 
-:warning: Replace `docker.io/mynamespace-replaceme/goldpinger:1.0.0` with the actual tag you built.
-
 ```yaml
 ---
 apiVersion: apps/v1
@@ -138,7 +145,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          image: "docker.io/mynamespace-replaceme/goldpinger:1.0.0"
+          image: "docker.io/bloomberg/goldpinger:1.4.0"
           ports:
             - containerPort: 80
               name: http
@@ -247,3 +254,5 @@ Before you create that PR, please make sure you read [CONTRIBUTING](./CONTRIBUTI
 ## License
 
 Please read the [LICENSE](./LICENSE) file here.
+
+For each version built by travis, there is also an additional version, appended with `-vendor`, which contains all source code of the dependencies used in `goldpinger`.

build/Dockerfile-simple

@@ -1,6 +1,6 @@
 FROM scratch
 
-ADD bin/goldpinger /goldpinger 
-COPY ./static /static
+COPY bin/goldpinger /goldpinger
+COPY static /static
 
 ENTRYPOINT ["/goldpinger", "--static-file-path", "/static"]

build/Dockerfile-vendor

@@ -0,0 +1,3 @@
+ARG TAG
+FROM $TAG
+COPY vendor /goldpinger-vendor-sources

docker_deploy.sh

@@ -1,4 +1,8 @@
 #!/bin/sh
 
-docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" && make tag && make push
+docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" \
+    && make tag \
+    && make push \
+    && make vendor-tag \
+    && make vendor-push
 

extras/example-serviceaccounts.yml

@@ -38,7 +38,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          image: "docker.io/mynamespace-replaceme/goldpinger:1.1.0"
+          image: "docker.io/bloomberg/goldpinger:1.4.0"
           ports:
             - containerPort: 80
               name: http

extras/example-with-kubeconfig.yaml

@@ -43,7 +43,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-          image: "docker.io/mynamespace-replaceme/goldpinger:1.1.0"
+          image: "docker.io/bloomberg/goldpinger:1.4.0"
           ports:
             - containerPort: 80
               name: http