Merge branch 'develop'

ImageMonkey · Jun 8, 2020 · 1eb972f · 1eb972f
2 parents f8e9e22 + 6c37b8e
commit 1eb972f
Show file tree

Hide file tree

Showing 17 changed files with 1,066 additions and 152 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,7 @@ src/data_processor
 src/trendinglabelsworker
 src/populate_labels
 src/statworker
+src/labels_downloader
+src/labels_merger
+src/make_labels_productive
+src/bot
diff --git a/env/docker/Dockerfile.blogsubscriptionworker b/env/docker/Dockerfile.blogsubscriptionworker
@@ -1,4 +1,4 @@
-FROM golang:1.12.14-buster
+FROM golang:1.14.4-buster
 
 ENV REDIS_ADDRESS=:6379
 ENV SENTRY_DSN=

diff --git a/env/docker/Dockerfile.bot b/env/docker/Dockerfile.bot
@@ -1,4 +1,4 @@
-FROM golang:1.12.14-buster
+FROM golang:1.14.4-buster
 
 RUN mkdir -p /home/go/bin
 ENV GOPATH=/home/go

diff --git a/env/docker/Dockerfile.buildbase b/env/docker/Dockerfile.buildbase
@@ -1,4 +1,4 @@
-FROM golang:1.12.14-buster
+FROM golang:1.14.4-buster
 
 ENV GOPATH=/home/go
 ENV GOBIN=/home/go/bin

diff --git a/env/docker/Dockerfile.dataprocessor b/env/docker/Dockerfile.dataprocessor
@@ -1,4 +1,4 @@
-FROM golang:1.12.14-buster
+FROM golang:1.14.4-buster
 
 ENV USE_SENTRY=true
 ARG SINGLESHOT=false

diff --git a/env/docker/Dockerfile.postgres b/env/docker/Dockerfile.postgres
@@ -1,4 +1,4 @@
-FROM postgres:9.6.13
+FROM postgres:9.6.18
 
 ARG TEMPORAL_TABLE_VERSION=1.2.0
 ARG POSTGIS_VERSION=2.5

diff --git a/env/docker/Dockerfile.statworker b/env/docker/Dockerfile.statworker
@@ -1,4 +1,4 @@
-FROM golang:1.12.14-buster
+FROM golang:1.14.4-buster
 
 ENV SENTRY_DSN=
 ENV IMAGEMONKEY_DB_CONNECTION_STRING=

diff --git a/env/docker/Dockerfile.testing b/env/docker/Dockerfile.testing
@@ -1,4 +1,4 @@
-FROM golang:1.12.14-buster
+FROM golang:1.14.4-buster
 
 # when changing the base image, change also the debian version here
 ARG DEBIAN_VERSION=buster

diff --git a/env/docker/Dockerfile.trendinglabelsworker b/env/docker/Dockerfile.trendinglabelsworker
@@ -1,4 +1,4 @@
-FROM golang:1.12.14-buster
+FROM golang:1.14.4-buster
 
 ENV USE_SENTRY=true
 ENV SINGLESHOT=false