Merge pull request #44 from microservices-demo/gcb-transition

Add GCB, remove travis docker push

Author: vlal

.gcloudignore

@@ -0,0 +1,15 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+#!include:.gitignore

.gitignore

@@ -1,5 +1,2 @@
-docker/catalogue/
 __pycache__/
-vendor/**
-!vendor/manifest
 coverage.out

.travis.yml

@@ -18,17 +18,9 @@ script:
   - set -e
   - ./scripts/build.sh;
   - ./test/test.sh unit.py
- # - ./test/test.sh component.py
   - ./test/test.sh container.py --tag $TAG
 
 after_success:
-  - set -e;
-  - if [ -z "$DOCKER_PASS" ] ; then
-      echo "This is a build triggered by an external PR. Skipping docker push.";
-      exit 0;
-    fi;
-  - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS;
-  - ./scripts/push.sh
   - $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci
 notifications:
   slack:

Makefile

@@ -9,13 +9,8 @@ INSTANCE = catalogue
 
 default: test
 
-copy:
-	docker create --name $(INSTANCE) $(NAME)-dev
-	docker cp $(INSTANCE):/app/main $(shell pwd)/app
-	docker rm $(INSTANCE)
-
 release:
-	docker build -t $(NAME) -f ./docker/catalogue/Dockerfile-release .
+	docker build -t $(NAME) -f ./docker/catalogue/Dockerfile .
 
 test: 
 	GROUP=weaveworksdemos COMMIT=test ./scripts/build.sh

cloudbuild.yaml

@@ -0,0 +1,10 @@
+steps:
+  - name: 'gcr.io/cloud-builders/docker'
+    args: ['build', '--cache-from', 'gcr.io/sock-shop-releases/catalogue', '-t', 'gcr.io/sock-shop-releases/catalogue', '-f', 'docker/catalogue/Dockerfile', '.']
+
+  - name: 'gcr.io/cloud-builders/docker'
+    args: ['tag', 'gcr.io/sock-shop-releases/catalogue', 'gcr.io/sock-shop-releases/catalogue:test']
+
+images:
+  - 'gcr.io/sock-shop-releases/catalogue'
+  - 'gcr.io/sock-shop-releases/catalogue:test'

docker-compose-zipkin.yml

@@ -5,7 +5,7 @@ services:
         build:
             context: .
             dockerfile: ./docker/catalogue/Dockerfile
-        image: weaveworksdemos/catalogue-dev
+        image: weaveworksdemos/catalogue
         hostname: catalogue
         restart: always
         cap_drop:
@@ -21,7 +21,7 @@ services:
     catalogue-db:
         build:
             context: ./docker/catalogue-db/
-        image: weaveworksdemos/catalogue-dev-db
+        image: weaveworksdemos/catalogue-db
         hostname: catalogue-db
         restart: always
         environment:

docker-compose.yml

@@ -5,7 +5,7 @@ services:
         build:
             context: .
             dockerfile: ./docker/catalogue/Dockerfile
-        image: weaveworksdemos/catalogue-dev
+        image: weaveworksdemos/catalogue
         hostname: catalogue
         restart: always
         cap_drop:
@@ -20,7 +20,7 @@ services:
     catalogue-db:
         build:
             context: ./docker/catalogue-db/
-        image: weaveworksdemos/catalogue-dev-db
+        image: weaveworksdemos/catalogue-db
         hostname: catalogue-db
         restart: always
         environment:

docker/catalogue/Dockerfile

@@ -1,14 +1,46 @@
 FROM golang:1.7
 
-RUN mkdir /app
-COPY . /go/src/github.com/microservices-demo/catalogue/
-COPY images/ /images/
+COPY . /go/src/github.com/microservices-demo/catalogue
+WORKDIR /go/src/github.com/microservices-demo/catalogue
 
 RUN go get -u github.com/FiloSottile/gvt
-RUN cd /go/src/github.com/microservices-demo/catalogue && gvt restore
+RUN gvt restore && \
+    CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /app github.com/microservices-demo/catalogue/cmd/cataloguesvc
+
+FROM alpine:3.4
+
+ENV	SERVICE_USER=myuser \
+	SERVICE_UID=10001 \
+	SERVICE_GROUP=mygroup \
+	SERVICE_GID=10001
+
+RUN	addgroup -g ${SERVICE_GID} ${SERVICE_GROUP} && \
+	adduser -g "${SERVICE_NAME} user" -D -H -G ${SERVICE_GROUP} -s /sbin/nologin -u ${SERVICE_UID} ${SERVICE_USER} && \
+	apk add --update libcap
+
+WORKDIR /
+COPY --from=0 /app /app
+COPY images/ /images/
+
+RUN	chmod +x /app && \
+	chown -R ${SERVICE_USER}:${SERVICE_GROUP} /app /images && \
+	setcap 'cap_net_bind_service=+ep' /app
+
+USER ${SERVICE_USER}
 
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /app/main github.com/microservices-demo/catalogue/cmd/cataloguesvc
+ARG BUILD_DATE
+ARG BUILD_VERSION
+ARG COMMIT
 
-CMD ["/app/main", "-port=80"]
+LABEL org.label-schema.vendor="Weaveworks" \
+  org.label-schema.build-date="${BUILD_DATE}" \
+  org.label-schema.version="${BUILD_VERSION}" \
+  org.label-schema.name="Socks Shop: Catalogue" \
+  org.label-schema.description="REST API for Catalogue service" \
+  org.label-schema.url="https://github.com/microservices-demo/catalogue" \
+  org.label-schema.vcs-url="github.com:microservices-demo/catalogue.git" \
+  org.label-schema.vcs-ref="${COMMIT}" \
+  org.label-schema.schema-version="1.0"
 
+CMD ["/app", "-port=80"]
 EXPOSE 80

docker/catalogue/Dockerfile-release

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 set -ev
 
@@ -7,42 +7,46 @@ export BUILD_DATE=`date +%Y-%m-%dT%T%z`
 
 SCRIPT_DIR=$(dirname "$0")
 
-if [[ -z "$GROUP" ]] ; then
+if [ -z "$GROUP" ] ; then
     echo "Cannot find GROUP env var"
     exit 1
 fi
 
-if [[ -z "$COMMIT" ]] ; then
+if [ -z "$COMMIT" ] ; then
     echo "Cannot find COMMIT env var"
     exit 1
 fi
 
-if [[ "$(uname)" == "Darwin" ]]; then
+$(docker -v >/dev/null 2>&1)
+if [ $? -eq 0 ]; then
     DOCKER_CMD=docker
 else
-    DOCKER_CMD="sudo docker"
+    DOCKER_CMD=`sudo docker`
 fi
 CODE_DIR=$(cd $SCRIPT_DIR/..; pwd)
 echo $CODE_DIR
 
-cp -r $CODE_DIR/images/ $CODE_DIR/docker/catalogue/images/
-cp -r $CODE_DIR/cmd/ $CODE_DIR/docker/catalogue/cmd/
-cp $CODE_DIR/*.go $CODE_DIR/docker/catalogue/
-mkdir -p $CODE_DIR/docker/catalogue/vendor && cp $CODE_DIR/vendor/manifest $CODE_DIR/docker/catalogue/vendor/
+mkdir -p $CODE_DIR/build
+BUILD_DIR=$CODE_DIR/build
+
+cp -r $CODE_DIR/docker $BUILD_DIR/
+cp -r $CODE_DIR/images/ $BUILD_DIR/docker/catalogue/images/
+cp -r $CODE_DIR/cmd/ $BUILD_DIR/docker/catalogue/cmd/
+cp $CODE_DIR/*.go $BUILD_DIR/docker/catalogue/
+mkdir -p $BUILD_DIR/docker/catalogue/vendor/ && \
+cp $CODE_DIR/vendor/manifest $BUILD_DIR/docker/catalogue/vendor/
 
 REPO=${GROUP}/$(basename catalogue);
 
-$DOCKER_CMD build -t ${REPO}-dev $CODE_DIR/docker/catalogue;
-$DOCKER_CMD create --name catalogue ${REPO}-dev;
-$DOCKER_CMD cp catalogue:/app/main $CODE_DIR/docker/catalogue/app;
-$DOCKER_CMD rm catalogue;
 $DOCKER_CMD build \
   --build-arg BUILD_VERSION=$BUILD_VERSION \
   --build-arg BUILD_DATE=$BUILD_DATE \
   --build-arg COMMIT=$COMMIT \
   -t ${REPO}:${COMMIT} \
-  -f $CODE_DIR/docker/catalogue/Dockerfile-release $CODE_DIR/docker/catalogue;
+  -f $BUILD_DIR/docker/catalogue/Dockerfile $BUILD_DIR/docker/catalogue;
 
 $DOCKER_CMD build \
   -t ${REPO}-db:${COMMIT} \
-  -f $CODE_DIR/docker/catalogue-db/Dockerfile $CODE_DIR/docker/catalogue-db;
+  -f $BUILD_DIR/docker/catalogue-db/Dockerfile $BUILD_DIR/docker/catalogue-db/;
+
+rm -rf $BUILD_DIR