Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Dockerfile: update for 0.10 release"

This commit is contained in:
Brad Fitzpatrick 2018-05-02 20:50:32 +00:00 committed by Gerrit Code Review
parent c39f4cabd4 9f65efad5a
commit ceb4f4c498
2 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Dockerfile
View File

@ -2,47 +2,72 @@
# Generic purpose Perkeep image, that builds the server (perkeepd) # Generic purpose Perkeep image, that builds the server (perkeepd)
# and the command-line clients (pk, pk-put, pk-get, and pk-mount). # and the command-line clients (pk, pk-put, pk-get, and pk-mount).
# Use misc/docker/go to generate perkeep/go # TODO: add the HEIC-supporting imagemagick to this Dockerfile too, in
FROM perkeep/go # some way that's minimally gross and not duplicating
# misc/docker/heiftojpeg's Dockerfile entirely. Not decided best way.
# TODO: likewise, djpeg binary? maybe. https://perkeep.org/issue/1142
MAINTAINER camlistore <camlistore@googlegroups.com> FROM buildpack-deps:stretch-scm AS pkbuild
MAINTAINER Perkeep Authors <perkeep@googlegroups.com>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get -y --no-install-recommends install adduser
RUN adduser --disabled-password --quiet --gecos Camli camli # gcc for cgo, sqlite
RUN mkdir -p /gopath/bin RUN apt-get update && apt-get install -y --no-install-recommends \
RUN chown camli.camli /gopath/bin g++ \
RUN mkdir -p /gopath/pkg gcc \
RUN chown camli.camli /gopath/pkg libc6-dev \
make \
pkg-config \
libsqlite3-dev
RUN mkdir -p /gopath/src ENV GOLANG_VERSION 1.10.2
ADD internal /gopath/src/perkeep.org/internal
ADD app /gopath/src/perkeep.org/app WORKDIR /usr/local
ADD dev /gopath/src/perkeep.org/dev RUN wget -O go.tgz https://dl.google.com/go/go1.10.2.linux-amd64.tar.gz
ADD cmd /gopath/src/perkeep.org/cmd RUN echo "4b677d698c65370afa33757b6954ade60347aaca310ea92a63ed717d7cb0c2ff go.tgz" | sha256sum -c -
ADD vendor /gopath/src/perkeep.org/vendor RUN tar -zxvf go.tgz
ADD server /gopath/src/perkeep.org/server
ADD pkg /gopath/src/perkeep.org/pkg
RUN mkdir -p /gopath/src/perkeep.org/clients
ADD clients/web /gopath/src/perkeep.org/clients/web
ADD make.go /gopath/src/perkeep.org/make.go
RUN echo 'dev' > /gopath/src/perkeep.org/VERSION
ENV GOROOT /usr/local/go ENV GOROOT /usr/local/go
ENV PATH $GOROOT/bin:/gopath/bin:$PATH ENV GOPATH /go
ENV GOPATH /gopath ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
ENV CGO_ENABLED 0
ENV CAMLI_GOPHERJS_GOROOT /usr/local/go
WORKDIR /gopath/src/perkeep.org RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
RUN go run make.go WORKDIR $GOPATH
RUN cp -a /gopath/src/perkeep.org/bin/* /gopath/bin/
ENV USER camli # Add each directory separately, so our context doesn't include the
ENV HOME /home/camli # Dockerfile itself, to permit quicker iteration with docker's
WORKDIR /home/camli # caching.
ADD app /go/src/perkeep.org/app
ADD clients /go/src/perkeep.org/clients
ADD cmd /go/src/perkeep.org/cmd
ADD config /go/src/perkeep.org/config
ADD dev /go/src/perkeep.org/dev
ADD doc /go/src/perkeep.org/doc
ADD internal /go/src/perkeep.org/internal
ADD pkg /go/src/perkeep.org/pkg
ADD server /go/src/perkeep.org/server
ADD vendor /go/src/perkeep.org/vendor
ADD website /go/src/perkeep.org/website
ADD make.go /go/src/perkeep.org/make.go
WORKDIR /go/src/perkeep.org
RUN echo "0.10" > VERSION
RUN go run make.go --sqlite=true -v
FROM debian:stretch
RUN mkdir -p /home/keepy/bin
ENV HOME /home/keepy
ENV PATH /home/keepy/bin:$PATH
COPY --from=pkbuild /go/bin/pk* /home/keepy/bin/
COPY --from=pkbuild /go/bin/perkeepd /home/keepy/bin/
EXPOSE 80 443 3179 8080 EXPOSE 80 443 3179 8080
WORKDIR /home/keepy
CMD /bin/bash CMD /bin/bash

38
Makefile
View File

@ -1,36 +1,16 @@
# The normal way to build Perkeep is just "go run make.go", which # The normal way to build Perkeep is just "go run make.go", which
# works everywhere, even on systems without Make. The rest of this # doesn't require make. This file is mostly little convenient aliases
# Makefile is mostly historical and should hopefully disappear over # and notes.
# time.
all: all:
go run make.go go run make.go
# On OS X with "brew install sqlite3", you need PKG_CONFIG_PATH=/usr/local/Cellar/sqlite/3.7.17/lib/pkgconfig/
full:
go install --ldflags="-X perkeep.org/pkg/buildinfo.GitInfo "`./misc/gitversion` `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` ./pkg/... ./server/... ./cmd/... ./dev/...
# Workaround Go bug where the $GOPATH/pkg cache doesn't know about tag changes.
# Useful when you accidentally run "make" and then "make presubmit" doesn't work.
# See https://code.google.com/p/go/issues/detail?id=4443
forcefull:
go install -a --tags=with_sqlite ./pkg/... ./server/perkeepd ./cmd/... ./dev/...
oldpresubmit: fmt
SKIP_DEP_TESTS=1 go test `pkg-config --libs sqlite3 1>/dev/null 2>/dev/null && echo "--tags=with_sqlite"` -short ./pkg/... ./server/perkeepd/... ./cmd/... ./dev/... && echo PASS
presubmit: fmt presubmit: fmt
go run dev/devcam/*.go test -short go install perkeep.org/dev/devcam
devcam test -short
embeds:
go install ./pkg/fileembed/genfileembed/ && genfileembed ./server/perkeepd/ui && genfileembed ./pkg/server
UIDIR = server/perkeepd/ui
NEWUIDIR = server/perkeepd/newui
clean:
rm -f $(NEWUIDIR)/all.js $(NEWUIDIR)/all.js.map
fmt: fmt:
go fmt perkeep.org/cmd... perkeep.org/dev... perkeep.org/misc... perkeep.org/pkg... perkeep.org/server... go fmt perkeep.org/cmd/... perkeep.org/dev/... perkeep.org/misc/... perkeep.org/pkg/... perkeep.org/server/... perkeep.org/internal/...
dockerbuild:
docker build --tag=gcr.io/perkeep-containers/perkeep:latest .