Merge branch 'develop'

Author: Bernhard B

env/docker/Dockerfile.api

@@ -1,4 +1,4 @@
-FROM bbernhard/imagemonkey-buildbase:latest
+FROM bbernhard/imagemonkey-buildbase2:latest
 
 ENV SENTRY_DSN=
 ENV X_CLIENT_ID=
@@ -14,11 +14,6 @@ RUN mkdir -p /home/go/bin
 ENV GOPATH=/home/go
 ENV GOBIN=/home/go/bin
 
-RUN apt-get update && apt-get install -y postgresql-client-9.6 --no-install-recommends \
-    # until this pull request (https://github.com/h2non/bimg/pull/266) is merged and https://github.com/h2non/bimg/issues/269 is resolved, use the fork
-	&& curl -s https://raw.githubusercontent.com/bbernhard/bimg/master/preinstall.sh | bash - \
-	&& rm -rf /var/lib/apt/lists/*
-
 COPY src/go.mod /tmp/src/go.mod
 COPY src/go.sum /tmp/src/go.sum
 

env/docker/Dockerfile.buildbase

@@ -13,15 +13,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh --directory-prefix=/usr/bin \
 	&& chmod u+rx /usr/bin/wait-for-it.sh
 
-# until this pull request (https://github.com/h2non/bimg/pull/266) is merged and https://github.com/h2non/bimg/issues/269 is resolved, use the fork
-#RUN curl -s https://raw.githubusercontent.com/bbernhard/bimg/master/preinstall.sh | bash -
-
 RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
 
 RUN mkdir -p /home/go/bin \
 	&& cd /tmp/src \
 	&& go get -u -d gocv.io/x/gocv \
-	&& cd /home/go/pkg/mod/gocv.io/x/gocv\@v0.20.0/ \
+	&& cd /home/go/pkg/mod/gocv.io/x/* \
 	&& make install \
 	&& rm -rf /tmp/src \
 	&& rm -rf /home/go/bin

env/docker/Dockerfile.buildbase2

@@ -0,0 +1,7 @@
+FROM bbernhard/imagemonkey-buildbase:latest
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+	postgresql-client-9.6 \
+	# until this pull request (https://github.com/h2non/bimg/pull/266) is merged and https://github.com/h2non/bimg/issues/269 is resolved, use the fork
+	&& curl -s https://raw.githubusercontent.com/bbernhard/bimg/master/preinstall.sh | bash - \
+	&& rm -rf /var/lib/apt/lists/*

env/docker/Dockerfile.web

@@ -1,4 +1,4 @@
-FROM bbernhard/imagemonkey-buildbase:latest
+FROM bbernhard/imagemonkey-buildbase2:latest
 
 ENV SENTRY_DSN=
 ENV X_CLIENT_ID=
@@ -19,12 +19,6 @@ ENV GOBIN=/home/go/bin
 
 RUN mkdir -p /home/imagemonkey
 
-RUN apt-get update && apt-get install -y pkg-config postgresql-client-9.6 --no-install-recommends \
-	# until this pull request (https://github.com/h2non/bimg/pull/266) is merged and https://github.com/h2non/bimg/issues/269 is resolved, use the fork
-	&& curl -s https://raw.githubusercontent.com/bbernhard/bimg/master/preinstall.sh | bash - \ 
-    && rm -rf /var/lib/apt/lists/* 
-
-
 COPY src/web.go /tmp/src/web.go
 COPY src/auth.go /tmp/src/auth.go
 COPY src/commons /tmp/src/commons