Merge branch 'develop'

Former-commit-id: 3e5fdce
mediaforensics · Mar 24, 2020 · 0bbefce · 0bbefce
2 parents 335b098 + c092a39
commit 0bbefce
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,21 @@
+FROM golang:1.14-buster as builder
+
+WORKDIR /go
+
+ENV GOPATH ""
+
+COPY . ./
+RUN cd cmd/analyticproxy && go build; cd -; \
+    cd cmd/medifor && go build; cd -
+
+FROM ubuntu:18.04
+
+ENV PATH ${PATH}:/app/bin
+RUN mkdir -p /app/bin
+
+COPY --from=builder /go/cmd/analyticproxy/analyticproxy /app/bin/
+COPY --from=builder /go/cmd/medifor/medifor /app/bin/
+
+EXPOSE 50051
+
+CMD ["analyticproxy", "--help"]
diff --git a/cmd/analyticproxy/.gitignore b/cmd/analyticproxy/.gitignore
@@ -0,0 +1 @@
+analyticproxy
diff --git a/cmd/analyticproxy/analyticproxy.REMOVED.git-id b/cmd/analyticproxy/analyticproxy.REMOVED.git-id
diff --git a/cmd/medifor/.gitignore b/cmd/medifor/.gitignore
@@ -0,0 +1 @@
+medifor