add filebrowser/filebrowser:dev, move dep execution to build.sh

pull/492/head
1138-4EB 2018-04-19 08:16:01 +02:00 committed by Henrique Dias
parent f91ee24858
commit d11aa8de6b
4 changed files with 24 additions and 16 deletions

View File

@ -1,20 +1,13 @@
FROM golang:alpine
COPY . /go/src/github.com/filebrowser/filebrowser
WORKDIR /go/src/github.com/filebrowser/filebrowser
RUN apk --no-cache --update upgrade && apk --no-cache add ca-certificates git curl && \
curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && \
chmod +x /usr/local/bin/dep
RUN dep ensure -vendor-only
WORKDIR /go/src/github.com/filebrowser/filebrowser/cmd/filebrowser
RUN CGO_ENABLED=0 go build -a
RUN mv filebrowser /go/bin/filebrowser
FROM scratch
COPY --from=0 /go/bin/filebrowser /filebrowser
COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=filebrowser/dev /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
VOLUME /tmp
VOLUME /srv

13
Dockerfile.dev Normal file
View File

@ -0,0 +1,13 @@
FROM golang:alpine
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
sed -i -e "s/v[0-9]\.[0-9]/edge/g" /etc/apk/repositories && \
apk --no-cache -U upgrade && apk --no-cache add ca-certificates yarn git curl dos2unix && \
go get github.com/GeertJohan/go.rice/rice && \
curl -fsSL -o /usr/local/bin/dep $( \
curl -s https://api.github.com/repos/golang/dep/releases/latest \
| grep "browser_download_url.*linux-amd64\"" \
| cut -d : -f 2,3 \
| tr -d \" \
) && \
chmod +x /usr/local/bin/dep

View File

@ -1,4 +1,5 @@
#!/bin/sh
set -e
cd $(dirname $0)
@ -16,6 +17,8 @@ yarn build
cd ..
dep ensure -vendor-only
# Install rice tool if not present
if ! [ -x "$(command -v rice)" ]; then
go get github.com/GeertJohan/go.rice/rice

View File

@ -1,17 +1,16 @@
#!/bin/sh
set -e
cd $(dirname $0)
docker pull golang:alpine
WORKDIR="/go/src/github.com/filebrowser/filebrowser"
$(command -v winpty) docker run --rm -it \
-v /$(pwd)://src \
-w //src \
golang:alpine \
-v /$(pwd):/${WORKDIR} \
-w /${WORKDIR} \
filebrowser/filebrowser:dev \
sh -c '\
echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
sed -i -e "s/v[0-9]\.[0-9]/edge/g" /etc/apk/repositories && \
apk add -U --no-cache yarn git && \
go get github.com/GeertJohan/go.rice/rice && \
dos2unix build.sh && \
./build.sh \
'