diff --git a/docker-compose.yml b/docker-compose.yml index 5ce1408..8d65c99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3" services: import: build: importer - image: docker.clkl.de/weather/import:0.3 + image: docker.clkl.de/weather/import:0.3.1 environment: - PYTHONUNBUFFERED=1 - TF_HOST=192.168.2.160 diff --git a/importer/Dockerfile b/importer/Dockerfile index 3712631..57281ce 100644 --- a/importer/Dockerfile +++ b/importer/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7-alpine +FROM python:3.8-alpine WORKDIR /app @@ -6,4 +6,4 @@ COPY . . RUN pip install -r requirements.txt -CMD ["python3.7", "/app/import.py"] +CMD ["python3.8", "/app/import.py"] diff --git a/importer/requirements.txt b/importer/requirements.txt index 5548ed4..61b92da 100644 --- a/importer/requirements.txt +++ b/importer/requirements.txt @@ -1,2 +1,2 @@ -tinkerforge==2.1.16 -requests==2.18.4 \ No newline at end of file +tinkerforge==2.1.26 +requests==2.23.0 diff --git a/snapshotter/docker-compose.yml b/snapshotter/docker-compose.yml index 33bf12e..6051f15 100644 --- a/snapshotter/docker-compose.yml +++ b/snapshotter/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: test: build: src - image: docker.clkl.de/weather/snapshot:0.1 + image: docker.clkl.de/weather/snapshot:0.2 volumes: - ./src/:/app - ./data:/data diff --git a/snapshotter/src/Dockerfile b/snapshotter/src/Dockerfile index d819acf..a2e9acb 100644 --- a/snapshotter/src/Dockerfile +++ b/snapshotter/src/Dockerfile @@ -1,10 +1,10 @@ -FROM alpine:3.8 +FROM alpine:3.12 ENV timezone Europe/Berlin ADD ["requirements.txt", "/"] -RUN apk add --update --no-cache python3 libssl1.0 && \ +RUN apk add --update --no-cache python3 libssl1.1 py3-pip && \ apk add --no-cache --virtual .build-deps g++ python3-dev libffi-dev openssl-dev make tzdata && \ cp /usr/share/zoneinfo/$timezone /etc/localtime && \ echo "$timezone" > /etc/timezone && \ pip3 install --upgrade pip && \ pip3 install -r requirements.txt && \ - apk del .build-deps \ No newline at end of file + apk del .build-deps