diff --git a/Dockerfile b/Dockerfile index 28146594a..a5c502286 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM photoprism/development:20190818 +FROM photoprism/development:20190919 # Set up project directory WORKDIR "/go/src/github.com/photoprism/photoprism" diff --git a/Makefile b/Makefile index 3ca036169..f063d5e45 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,8 @@ start: go run cmd/photoprism/photoprism.go start -d stop: go run cmd/photoprism/photoprism.go stop +terminal: + docker-compose exec photoprism bash migrate: go run cmd/photoprism/photoprism.go migrate install-bin: diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 6ccb8176a..eb7e5b829 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -82,12 +82,12 @@ RUN npm install --unsafe-perm=true --allow-root -g npm testcafe chromedriver RUN npm config set cache ~/.cache/npm # Install Go -ENV GOLANG_VERSION 1.12.7 +ENV GOLANG_VERSION 1.13 RUN set -eux; \ \ url="https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz"; \ wget -O go.tgz "$url"; \ - echo "66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9 *go.tgz" | sha256sum -c -; \ + echo "68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856 *go.tgz" | sha256sum -c -; \ tar -C /usr/local -xzf go.tgz; \ rm go.tgz; \ export PATH="/usr/local/go/bin:$PATH"; \ diff --git a/docker/photoprism/Dockerfile b/docker/photoprism/Dockerfile index d799f95fa..0a3ed60cc 100644 --- a/docker/photoprism/Dockerfile +++ b/docker/photoprism/Dockerfile @@ -1,4 +1,4 @@ -FROM photoprism/development:20190818 as build +FROM photoprism/development:20190919 as build # Set up project directory WORKDIR "/go/src/github.com/photoprism/photoprism" diff --git a/go.mod b/go.mod index adf8b083f..e43963109 100644 --- a/go.mod +++ b/go.mod @@ -68,3 +68,5 @@ require ( gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect gopkg.in/yaml.v2 v2.2.2 ) + +go 1.13