Skip to content

Commit 1eb972f

Browse files
author
Bernhard B
committed
Merge branch 'develop'
2 parents f8e9e22 + 6c37b8e commit 1eb972f

17 files changed

+1066
-152
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ src/data_processor
1616
src/trendinglabelsworker
1717
src/populate_labels
1818
src/statworker
19+
src/labels_downloader
20+
src/labels_merger
21+
src/make_labels_productive
22+
src/bot

env/docker/Dockerfile.blogsubscriptionworker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.14-buster
1+
FROM golang:1.14.4-buster
22

33
ENV REDIS_ADDRESS=:6379
44
ENV SENTRY_DSN=

env/docker/Dockerfile.bot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.14-buster
1+
FROM golang:1.14.4-buster
22

33
RUN mkdir -p /home/go/bin
44
ENV GOPATH=/home/go

env/docker/Dockerfile.buildbase

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.14-buster
1+
FROM golang:1.14.4-buster
22

33
ENV GOPATH=/home/go
44
ENV GOBIN=/home/go/bin

env/docker/Dockerfile.dataprocessor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.14-buster
1+
FROM golang:1.14.4-buster
22

33
ENV USE_SENTRY=true
44
ARG SINGLESHOT=false

env/docker/Dockerfile.postgres

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:9.6.13
1+
FROM postgres:9.6.18
22

33
ARG TEMPORAL_TABLE_VERSION=1.2.0
44
ARG POSTGIS_VERSION=2.5

env/docker/Dockerfile.statworker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.14-buster
1+
FROM golang:1.14.4-buster
22

33
ENV SENTRY_DSN=
44
ENV IMAGEMONKEY_DB_CONNECTION_STRING=

env/docker/Dockerfile.testing

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.14-buster
1+
FROM golang:1.14.4-buster
22

33
# when changing the base image, change also the debian version here
44
ARG DEBIAN_VERSION=buster

env/docker/Dockerfile.trendinglabelsworker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.12.14-buster
1+
FROM golang:1.14.4-buster
22

33
ENV USE_SENTRY=true
44
ENV SINGLESHOT=false

0 commit comments

Comments
 (0)