From fba2481324e39de6a73f3d393543debd75edc59f Mon Sep 17 00:00:00 2001 From: llitfkitfk Date: Thu, 27 Jul 2017 16:51:43 +0800 Subject: [PATCH] remove npm build & rice --- Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ca58dbd..e4a7e892 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,12 @@ -FROM node:alpine -WORKDIR /src/app -COPY . /src/app -RUN yarn install && rm -rf assets/dist && npm run build - FROM golang:alpine WORKDIR /go/src/github.com/hacdias/filemanager COPY . /go/src/github.com/hacdias/filemanager -COPY --from=0 /src/app/assets/dist /go/src/github.com/hacdias/filemanager/assets/dist -RUN apk add --no-cache git && go get -u github.com/golang/dep/cmd/dep && go get github.com/GeertJohan/go.rice/rice +RUN apk add --no-cache git && go get -u github.com/golang/dep/cmd/dep -RUN dep ensure -update && rice embed-go && cd ./caddy/hugo && rice embed-go +RUN dep ensure -update RUN cd /go/src/github.com/hacdias/filemanager/cmd/filemanager && go build FROM alpine:latest -COPY --from=1 /go/src/github.com/hacdias/filemanager/cmd/filemanager/filemanager /usr/local/bin/filemanager +COPY --from=0 /go/src/github.com/hacdias/filemanager/cmd/filemanager/filemanager /usr/local/bin/filemanager ENTRYPOINT ["filemanager"] CMD ["-h"] \ No newline at end of file