From 93794f72c4203289d6d4cdc70382197aa2ea6572 Mon Sep 17 00:00:00 2001 From: Michael Weimann Date: Mon, 14 Jun 2021 21:55:27 +0200 Subject: [PATCH] add Dockerfile --- Dockerfile | 34 ++++++++++++++++++++++ Pipfile | 2 +- Pipfile.lock | 75 ++++++++++++++++++++++++------------------------- README.md | 45 +++++++++++++++++++++++++++-- data/.gitignore | 1 + 5 files changed, 115 insertions(+), 42 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..242ea2f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,34 @@ +FROM python:3.8-alpine as base + +ENV PYROOT /pyroot +ENV PYTHONUSERBASE $PYROOT + + +FROM base as builder + +RUN apk add --no-cache \ + gcc \ + g++ \ + musl-dev \ + python3-dev && \ + pip3 install pipenv + +COPY Pipfile* ./ + +RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-pipfile +RUN pip3 uninstall --yes pipenv + + +FROM base + +# Install six explicitly. Otherwise Python complains about it missing. +RUN pip3 install six + +COPY --from=builder $PYROOT/bin/ $PYROOT/bin/ +COPY --from=builder $PYROOT/lib/ $PYROOT/lib/ + +WORKDIR /app + +COPY . . + +CMD ["python3", "run_prod.py"] diff --git a/Pipfile b/Pipfile index 698de38..703066c 100644 --- a/Pipfile +++ b/Pipfile @@ -10,9 +10,9 @@ flask-migrate = "*" flask-sqlalchemy = "*" sqlalchemy = "*" waitress = "*" +pyyaml = "*" [dev-packages] -pyyaml = "*" [requires] python_version = "3.8" diff --git a/Pipfile.lock b/Pipfile.lock index bb7c51f..14d52c3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "1a3f310d3d4b4507d76b8074a0580f84ab15774f21edc1f178f2eb736d2c3467" + "sha256": "5cf841925fa45f6b1c8fd6b5bd3829f5b02b81413815d3fa4755acb6c4132e2e" }, "pipfile-spec": 6, "requires": { @@ -201,6 +201,41 @@ ], "version": "==1.0.4" }, + "pyyaml": { + "hashes": [ + "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf", + "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696", + "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393", + "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77", + "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922", + "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5", + "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8", + "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10", + "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc", + "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", + "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", + "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", + "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", + "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", + "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", + "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", + "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", + "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", + "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", + "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", + "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", + "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", + "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", + "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", + "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", + "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", + "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", + "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", + "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" + ], + "index": "pypi", + "version": "==5.4.1" + }, "six": { "hashes": [ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", @@ -262,41 +297,5 @@ "version": "==2.0.1" } }, - "develop": { - "pyyaml": { - "hashes": [ - "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf", - "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696", - "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393", - "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77", - "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922", - "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5", - "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8", - "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10", - "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc", - "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", - "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", - "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", - "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", - "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", - "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", - "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", - "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", - "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", - "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", - "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", - "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", - "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", - "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", - "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", - "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", - "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", - "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", - "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", - "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" - ], - "index": "pypi", - "version": "==5.4.1" - } - } + "develop": {} } diff --git a/README.md b/README.md index 6539fca..ae5468e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ python -m unittest discover ki Für ein Login ohne LDAP werden die Benutzer aus der [`auth.yml`](./data/auth.yml) benutzt. -### Test-Requests +### Beispiel-Requests Beispiele brauchen curl und jq. @@ -66,13 +66,52 @@ curl -s \ http://localhost:5000/users/1/profile ``` -### Produktionsumgebung + +## Docker + +### Image bauen + +``` +docker build --tag ki . +``` + + +### Container starten + +Im Beispiel wird die SQLite Datenbank `./data/ki_backend.sqlite` verwendet. + +DB-Datei anlegen + +``` +touch data/ki_docker.sqlite +chmod a+rw data/ki_docker.sqlite +``` + +Container starten + +``` +docker run \ + --name=ki_backend \ + -v ${PWD}/data/ki_docker.sqlite:/app/data/ki_docker.sqlite \ + -e SQLALCHEMY_DATABASE_URI='sqlite:///data/ki_docker.sqlite' \ + -p 5000:5000 \ + ki +``` + +Skills und Sprachen importieren + +``` +docker exec ki_backend sh -c "cd /app && /pyroot/bin/flask seed" +``` + + +## Produktionsumgebung Für die Produktionsumgebung wird [waitress](https://docs.pylonsproject.org/projects/waitress/en/latest/) benutzt. [`run_prod.py`](./run_prod.py) führt die DB Migrationen aus und startet den Server. -### Quellen +## Quellen * [`./data/iso_639_1.csv`](https://de.wikipedia.org/wiki/Liste_der_ISO-639-1-Codes) * [`./data/imgs/flags`](https://github.com/gosquared/flags) diff --git a/data/.gitignore b/data/.gitignore index bd1838f..57478db 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1 +1,2 @@ ki.sqlite +ki_docker.sqlite