clean ci (#306)

cs3org · Oct 17, 2019 · ffa0628 · ffa0628
1 parent 146cbf8
commit ffa0628
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile.reva b/Dockerfile.reva
@@ -16,13 +16,13 @@
 # granted to it by virtue of its status as an Intergovernmental Organization 
 # or submit itself to any jurisdiction.
 
-FROM golang:1.11
+FROM golang:1.13
 
 WORKDIR /go/src/github/cs3org/reva
 COPY . .
 RUN GO111MODULE=off make deps
 ENV GO111MODULE=on
-RUN make build-reva
+RUN make deps && make
 WORKDIR /go/src/github/cs3org/reva/cmd/reva
 RUN go install
 ENTRYPOINT ["/go/bin/reva"]
diff --git a/Dockerfile.revad b/Dockerfile.revad
@@ -16,17 +16,17 @@
 # granted to it by virtue of its status as an Intergovernmental Organization 
 # or submit itself to any jurisdiction.
 
-FROM golang:1.11
+FROM golang:1.13
 
 WORKDIR /go/src/github/cs3org/reva
 COPY . .
 RUN GO111MODULE=off make deps
 ENV GO111MODULE=on
-RUN make build-revad
+RUN make deps && make 
 WORKDIR /go/src/github/cs3org/reva/cmd/revad
 RUN go install
 RUN mkdir -p /etc/revad/
-RUN cp /go/src/github/cs3org/reva/cmd/revad/revad.toml /etc/revad/revad.toml
-EXPOSE 9998
+RUN echo "" > /etc/revad/revad.toml
 EXPOSE 9999
+EXPOSE 10000
 CMD ["/go/bin/revad", "-c", "/etc/revad/revad.toml", "-p", "/var/run/revad.pid"]