beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Dockerfile: Upgrade to Go 1.13

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2019-09-19 09:22:44 -07:00
parent 31d5f30637
commit 8f145ce9a9
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM photoprism/development:20190818 FROM photoprism/development:20190919
# Set up project directory # Set up project directory
WORKDIR "/go/src/github.com/photoprism/photoprism" WORKDIR "/go/src/github.com/photoprism/photoprism"

2
Makefile
View file

@ -25,6 +25,8 @@ start:
go run cmd/photoprism/photoprism.go start -d go run cmd/photoprism/photoprism.go start -d
stop: stop:
go run cmd/photoprism/photoprism.go stop go run cmd/photoprism/photoprism.go stop
terminal:
docker-compose exec photoprism bash
migrate: migrate:
go run cmd/photoprism/photoprism.go migrate go run cmd/photoprism/photoprism.go migrate
install-bin: install-bin:

4
docker/development/Dockerfile
View file

@ -82,12 +82,12 @@ RUN npm install --unsafe-perm=true --allow-root -g npm testcafe chromedriver
RUN npm config set cache ~/.cache/npm RUN npm config set cache ~/.cache/npm
# Install Go # Install Go
ENV GOLANG_VERSION 1.12.7 ENV GOLANG_VERSION 1.13
RUN set -eux; \ RUN set -eux; \
\ \
url="https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \ url="https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \
wget -O go.tgz "$url"; \ wget -O go.tgz "$url"; \
echo "66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9 *go.tgz" | sha256sum -c -; \ echo "68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856 *go.tgz" | sha256sum -c -; \
tar -C /usr/local -xzf go.tgz; \ tar -C /usr/local -xzf go.tgz; \
rm go.tgz; \ rm go.tgz; \
export PATH="/usr/local/go/bin:$PATH"; \ export PATH="/usr/local/go/bin:$PATH"; \

2
docker/photoprism/Dockerfile
View file

@ -1,4 +1,4 @@
FROM photoprism/development:20190818 as build FROM photoprism/development:20190919 as build
# Set up project directory # Set up project directory
WORKDIR "/go/src/github.com/photoprism/photoprism" WORKDIR "/go/src/github.com/photoprism/photoprism"

2
go.mod
View file

@ -68,3 +68,5 @@ require (
gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
gopkg.in/yaml.v2 v2.2.2 gopkg.in/yaml.v2 v2.2.2
) )
go 1.13