From 2e6894ad14d32068aa39a5ba01461769b7311ee6 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.cyberia@doesthisthing.work>
Date: Tue, 20 Jul 2021 23:48:23 +0200
Subject: [PATCH] Changes from @decentral1se code review

---
 Dockerfile              | 25 ++++++++++++++++++++-----
 capsulflask/__init__.py |  2 +-
 docker-compose.yml      |  2 +-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4d74449..e148126 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,17 @@
 FROM python:3.8-alpine as build
 
-RUN apk add gettext git gcc python3-dev musl-dev \
-    libffi-dev zlib-dev jpeg-dev libjpeg postgresql-dev build-base \
-    --virtual .build-dependencies
+RUN apk add --no-cache \
+    build-base \
+    gcc \
+    gettext \
+    git \
+    jpeg-dev \
+    libffi-dev \
+    libjpeg \
+    musl-dev \
+    postgresql-dev \
+    python3-dev \
+    zlib-dev
 
 RUN mkdir -p /app/{code,venv}
 WORKDIR /app/code
@@ -17,8 +26,14 @@ RUN pipenv install --deploy --verbose
 
 FROM python:3.8-alpine
 
-RUN apk add --no-cache libpq libstdc++ libjpeg virt-install libvirt-client \
-    cloud-utils openssh-client
+RUN apk add --no-cache \
+    cloud-utils \
+    libjpeg \
+    libpq \
+    libstdc++ \
+    libvirt-client \
+    openssh-client \
+    virt-install
 
 COPY . /app/code/
 WORKDIR /app/code
diff --git a/capsulflask/__init__.py b/capsulflask/__init__.py
index 4ae85de..3efead2 100644
--- a/capsulflask/__init__.py
+++ b/capsulflask/__init__.py
@@ -33,7 +33,7 @@ for var_name in [
   "SPOKE_HOST_TOKEN", "HUB_TOKEN", "STRIPE_SECRET_KEY",
   "BTCPAY_PRIVATE_KEY", "MAIL_PASSWORD"
 ]:
-  var = os.environ.get(f"{var_name}_FILE", False)
+  var = os.environ.get(f"{var_name}_FILE")
   if not var:
     continue
 
diff --git a/docker-compose.yml b/docker-compose.yml
index cd91ab5..d11c257 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
     devices:
       - "/dev/kvm:/dev/kvm"
   db:
-    image: "postgres:9.6.5"
+    image: "postgres:9.6.5-alpine"
     volumes:
       - "postgres:/var/lib/postgresql/data"
     environment: