From cf828287cb1cf1dc56c583c35ec9447a660c6bc4 Mon Sep 17 00:00:00 2001 From: mitsuha_s Date: Mon, 25 Jul 2022 22:47:30 +0000 Subject: [PATCH 1/6] add other used environment variables --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b8a77a7..babe664 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ COPY . . RUN pip install -r requirements.txt -ENV PYTHONUNBUFFERED=1 +ENV PYTHONUNBUFFERED=1 RSSBOT_DSN=xxx RSSBOT_TG_TOKEN=xxx LOG_LEVEL=INFO # App settings # https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING -- 2.40.1 From 8d4b0f22c4596d09b2690f60ffc38513c5ea39fc Mon Sep 17 00:00:00 2001 From: mitsuha_s Date: Mon, 25 Jul 2022 23:29:06 +0000 Subject: [PATCH 2/6] code style changes --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index babe664..ba73587 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,12 @@ COPY . . RUN pip install -r requirements.txt -ENV PYTHONUNBUFFERED=1 RSSBOT_DSN=xxx RSSBOT_TG_TOKEN=xxx LOG_LEVEL=INFO +ENV PYTHONUNBUFFERED=1 + +# App settings +ENV RSSBOT_DSN=xxx +ENV RSSBOT_TG_TOKEN=xxx +ENV LOG_LEVEL=INFO # App settings # https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING -- 2.40.1 From 41e52003e04eb9ae12723dea12e511f6f12e4c26 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sun, 7 Aug 2022 20:56:42 +0300 Subject: [PATCH 3/6] Adding Docker image build to Drone CI configuration. --- .drone.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.drone.yml b/.drone.yml index a7e9afc..add7dd2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,3 +30,22 @@ steps: - pull_request branch: exclude: master + - name: docker-build + # https://github.com/drone/drone-plugin-index/blob/main/plugins/docker/original.md + image: plugins/docker + when: + branch: + - master + event: + - push + settings: + username: + from_secret: docker_username + password: + from_secret: docker_token + repo: + from_secret: docker_repo + tags: + - latest + - ${DRONE_COMMIT_SHA:0:10} + - ${DRONE_TAG} -- 2.40.1 From de0359d681f86e5ec122cec7bea66f4b6e3cdfc5 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sun, 7 Aug 2022 20:59:43 +0300 Subject: [PATCH 4/6] Adding link to Drone environment variables reference. --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index add7dd2..3050e0d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,5 +47,6 @@ steps: from_secret: docker_repo tags: - latest + # https://docs.drone.io/pipeline/environment/reference/ - ${DRONE_COMMIT_SHA:0:10} - ${DRONE_TAG} -- 2.40.1 From 6d22d78882ae69d8013156d01791fa70a1227a7f Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 13 Aug 2022 23:14:35 +0300 Subject: [PATCH 5/6] #36 Removing duplicated variables in Dockerfile after rebase. --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba73587..b8a77a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,11 +8,6 @@ RUN pip install -r requirements.txt ENV PYTHONUNBUFFERED=1 -# App settings -ENV RSSBOT_DSN=xxx -ENV RSSBOT_TG_TOKEN=xxx -ENV LOG_LEVEL=INFO - # App settings # https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING ENV RSSBOT_DSN=postgres://username:password@hostname/database_name -- 2.40.1 From 34a96a11648169283db22af3674f7f404c4c4dfc Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 13 Aug 2022 23:19:12 +0300 Subject: [PATCH 6/6] #36 Some renamings in .drone.yml. --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3050e0d..5cb343b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ kind: pipeline type: docker -name: app-check +name: build steps: - name: build-deps @@ -30,7 +30,7 @@ steps: - pull_request branch: exclude: master - - name: docker-build + - name: build-docker # https://github.com/drone/drone-plugin-index/blob/main/plugins/docker/original.md image: plugins/docker when: -- 2.40.1