Merge pull request #31 from deNBI/dev

Dev

.default.env

@@ -10,6 +10,8 @@ INFLUXDB_USER=prometheus
 INFLUXDB_USER_PASSWORD=secret
 INFLUXDB_DB=portal_prometheus
 
+API_KEY="change-me-but-not-to-123"
+
 # Semicolon-separated list of project/group names.
 # If set only those will be billed
 # OS_CREDITS_PROJECT_WHITELIST

Dockerfile

@@ -1,14 +1,14 @@
-FROM python:3.9.1-alpine as builder
+FROM python:3.9.2-alpine as builder
 
 ADD src /code/src
 ADD pyproject.toml poetry.lock /code/
 WORKDIR /code
-RUN apk add gcc musl-dev python3-dev libffi-dev openssl-dev
+RUN apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo
 RUN pip install poetry && poetry build -f wheel
 
 # by using a build container we prevent us from carrying around poetry
 # alongside its dependencies
-FROM python:3.9.1-alpine
+FROM python:3.9.2-alpine
 ARG OS_CREDITS_VERSION
 ARG WHEEL_NAME=os_credits-1.1.0-py3-none-any.whl
 EXPOSE 80

Dockerfile.dev

@@ -1,12 +1,13 @@
 # Expected to be called with `--volume $(PWD)/src:/code/src:ro`
 # Uses `adev` from `aiohttp-devtools` to restart the application on any code change
-FROM python:3.9.1-alpine
+FROM python:3.9.2-alpine
 
 ADD src /code/src
 ADD pyproject.toml poetry.lock /code/
 WORKDIR /code
-RUN apk update && apk --no-cache add gcc wget linux-headers musl-dev libffi-dev libressl-dev
-RUN pip install --no-cache poetry
+RUN apk -U upgrade && apk --no-cache add gcc wget linux-headers musl-dev libffi-dev libressl-dev cargo
+RUN pip install cryptography
+RUN pip install poetry
 # install to system
 RUN poetry config virtualenvs.create false
 # we do not need any development packages except aiohttp-devtools to

docker-compose.yml

@@ -9,6 +9,7 @@ services:
       - MAIL_SMTP_SERVER=smtp_server
       - MAIL_NOT_STARTTLS=1
       - INFLUXDB_HOST=influxdb
+      - API_KEY
     ports:
       - "8002:80"
     depends_on: