new docker images (cs3org#309)

* new docker images

* new pipeline for pr

* limit publish docker to master branch

.drone.yml

@@ -1,12 +1,65 @@
 ---
 kind: pipeline
 type: docker
-name: build
+name: build-and-publish-docker
 
 platform:
   os: linux
   arch: amd64
 
+trigger:
+  branch:
+  - master
+  event:
+    exclude:
+    - pull_request
+    - tag
+    - promote
+    - rollback
+steps:
+- name: build
+  image: golang:1.13
+  commands:
+    - make ci
+
+- name: publish-docker-reva-latest
+  pull: always
+  image: plugins/docker
+  settings:
+    repo: cs3org/reva
+    tags: latest
+    dockerfile: Dockerfile.reva
+    username:
+      from_secret: dockerhub_username
+    password:
+      from_secret: dockerhub_password
+
+- name: publish-docker-revad-latest
+  pull: always
+  image: plugins/docker
+  settings:
+    repo: cs3org/revad
+    tags: latest
+    dockerfile: Dockerfile.revad
+    username:
+      from_secret: dockerhub_username
+    password:
+      from_secret: dockerhub_password
+
+---
+kind: pipeline
+type: docker
+name: build-only
+
+platform:
+  os: linux
+  arch: amd64
+
+trigger:
+  event:
+    include:
+    - pull_request
+
 steps:
 - name: build
   image: golang:1.13

Dockerfile.reva

@@ -20,9 +20,5 @@ FROM golang:1.13
 
 WORKDIR /go/src/github/cs3org/reva
 COPY . .
-RUN GO111MODULE=off make deps
-ENV GO111MODULE=on
-RUN make deps && make
-WORKDIR /go/src/github/cs3org/reva/cmd/reva
-RUN go install
+RUN make build-reva-docker && cp /go/src/github/cs3org/reva/cmd/reva/reva /go/bin/reva
 ENTRYPOINT ["/go/bin/reva"]

Dockerfile.revad

@@ -20,13 +20,7 @@ FROM golang:1.13
 
 WORKDIR /go/src/github/cs3org/reva
 COPY . .
-RUN GO111MODULE=off make deps
-ENV GO111MODULE=on
-RUN make deps && make 
-WORKDIR /go/src/github/cs3org/reva/cmd/revad
-RUN go install
-RUN mkdir -p /etc/revad/
-RUN echo "" > /etc/revad/revad.toml
+RUN make build-revad-docker && cp /go/src/github/cs3org/reva/cmd/revad/revad /go/bin/revad && mkdir -p /etc/revad/ && echo "" > /etc/revad/revad.toml
 EXPOSE 9999
 EXPOSE 10000
 CMD ["/go/bin/revad", "-c", "/etc/revad/revad.toml", "-p", "/var/run/revad.pid"]

Makefile

@@ -25,7 +25,7 @@ tidy:
 	go mod tidy
 
 build-revad: imports
-	go build -mod=venodr -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad 
+	go build -mod=vendor -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad 
 
 build-reva: imports
 	go build -mod=vendor -o ./cmd/reva/reva ${LDFLAGS} ./cmd/reva
@@ -54,3 +54,10 @@ lint-ci:
 
 # to be run in CI platform
 ci: build-ci test  lint-ci
+
+# to be run in Docker build
+build-revad-docker: off
+	go build -mod=vendor -o ./cmd/revad/revad ${LDFLAGS} ./cmd/revad 
+build-reva-docker: off
+	go build -mod=vendor -o ./cmd/revad/reva ${LDFLAGS} ./cmd/reva
+