Compare commits
32 Commits
feature/#6
...
pyenv
Author | SHA1 | Date | |
---|---|---|---|
47d2c94b79
|
|||
b0dcfacd25
|
|||
86edb246bf | |||
9424e21edc | |||
f02efab07a | |||
08f1104942
|
|||
8dde142f38
|
|||
d1b1636aa2 | |||
3fcd1fa20e | |||
8394400e96 | |||
843050f923 | |||
812913ffe2 | |||
dee80c7e14 | |||
de60ec0d46 | |||
6c6fcea81c | |||
166e0d40c6 | |||
c9b5ab62ed | |||
c0005100b4 | |||
d614039cdd | |||
316236a7e5 | |||
c15faabd6d
|
|||
53eab74e60 | |||
82d908193c | |||
6620a6819a | |||
be6fec18ab
|
|||
9ebae03550 | |||
763a6efc9f | |||
6f04d23e6c
|
|||
155ddc556c
|
|||
a5a85e6032
|
|||
6a3458a596
|
|||
97be8f4667
|
13
.dockerignore
Normal file
13
.dockerignore
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
*
|
||||||
|
!Pipfile
|
||||||
|
!Pipfile.lock
|
||||||
|
!data/
|
||||||
|
!ki/
|
||||||
|
!LICENSES/
|
||||||
|
!migrations/
|
||||||
|
!app.py
|
||||||
|
!run_prod.py
|
23
.drone.yml
23
.drone.yml
@ -15,16 +15,18 @@ trigger:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: install-lint-test
|
- name: install-lint-test
|
||||||
image: git.wtf-eg.de/kompetenzinventar/builder:1.0.2
|
image: python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea
|
||||||
|
env:
|
||||||
|
PYROOT: '/pyroot'
|
||||||
|
PYTHONUSERBASE: '/pyroot'
|
||||||
commands:
|
commands:
|
||||||
|
- apk add --no-cache gcc g++ musl-dev python3-dev
|
||||||
|
- pip3 install pipenv
|
||||||
- pipenv install --dev
|
- pipenv install --dev
|
||||||
- pipenv run flake8
|
- pipenv run flake8
|
||||||
- pipenv run reuse lint
|
- pipenv run reuse lint
|
||||||
- pipenv run python -m unittest discover ki
|
- pipenv run python -m unittest discover ki
|
||||||
|
|
||||||
image_pull_secrets:
|
|
||||||
- dockerconfig
|
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
@ -41,7 +43,7 @@ depends_on:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: docker-publish
|
- name: docker-publish
|
||||||
image: plugins/docker
|
image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
|
||||||
settings:
|
settings:
|
||||||
registry: git.wtf-eg.de
|
registry: git.wtf-eg.de
|
||||||
repo: git.wtf-eg.de/kompetenzinventar/backend
|
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||||
@ -68,7 +70,7 @@ depends_on:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: deploy-dev
|
- name: deploy-dev
|
||||||
image: appleboy/drone-ssh
|
image: appleboy/drone-ssh:1.7.5@sha256:995677e073454912f26d4c0fdd2f9df2e1f5a30d6603d3f2ece667311b6babb3
|
||||||
settings:
|
settings:
|
||||||
host:
|
host:
|
||||||
- dev01.wtf-eg.net
|
- dev01.wtf-eg.net
|
||||||
@ -91,14 +93,19 @@ trigger:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: install-lint-test
|
- name: install-lint-test
|
||||||
image: git.wtf-eg.de/kompetenzinventar/builder:1.0.2
|
image: python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea
|
||||||
|
env:
|
||||||
|
PYROOT: '/pyroot'
|
||||||
|
PYTHONUSERBASE: '/pyroot'
|
||||||
commands:
|
commands:
|
||||||
|
- apk add --no-cache gcc g++ musl-dev python3-dev
|
||||||
|
- pip3 install pipenv
|
||||||
- pipenv install --dev
|
- pipenv install --dev
|
||||||
- pipenv run flake8
|
- pipenv run flake8
|
||||||
- pipenv run reuse lint
|
- pipenv run reuse lint
|
||||||
- pipenv run python -m unittest discover ki
|
- pipenv run python -m unittest discover ki
|
||||||
- name: docker-publish
|
- name: docker-publish
|
||||||
image: plugins/docker
|
image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
|
||||||
settings:
|
settings:
|
||||||
registry: git.wtf-eg.de
|
registry: git.wtf-eg.de
|
||||||
repo: git.wtf-eg.de/kompetenzinventar/backend
|
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||||
|
1
.python-version
Normal file
1
.python-version
Normal file
@ -0,0 +1 @@
|
|||||||
|
3.8.19
|
@ -10,3 +10,7 @@ License: MIT
|
|||||||
Files: Pipfile.lock migrations/*
|
Files: Pipfile.lock migrations/*
|
||||||
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
License: AGPL-3.0-or-later
|
License: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
Files: renovate.json .python-version
|
||||||
|
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
License: AGPL-3.0-or-later
|
||||||
|
17
Dockerfile
17
Dockerfile
@ -2,7 +2,17 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
FROM git.wtf-eg.de/kompetenzinventar/builder:1.0.2 as builder
|
FROM python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea AS builder
|
||||||
|
|
||||||
|
ENV PYROOT=/pyroot
|
||||||
|
ENV PYTHONUSERBASE=$PYROOT
|
||||||
|
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
gcc \
|
||||||
|
g++ \
|
||||||
|
musl-dev \
|
||||||
|
python3-dev && \
|
||||||
|
pip3 install pipenv
|
||||||
|
|
||||||
COPY Pipfile* ./
|
COPY Pipfile* ./
|
||||||
|
|
||||||
@ -10,7 +20,10 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
|
|||||||
RUN pip3 uninstall --yes pipenv
|
RUN pip3 uninstall --yes pipenv
|
||||||
|
|
||||||
|
|
||||||
FROM git.wtf-eg.de/kompetenzinventar/base:1.0.2 as ki-backend
|
FROM python:3.8.19-alpine@sha256:3bd7ea88cb637e09d6c7de24c5394657163a85c2be82bfebe0305cf07f8de1ea AS ki-backend
|
||||||
|
|
||||||
|
ENV PYROOT=/pyroot
|
||||||
|
ENV PYTHONUSERBASE=$PYROOT
|
||||||
|
|
||||||
# Install six explicitly. Otherwise Python complains about it missing.
|
# Install six explicitly. Otherwise Python complains about it missing.
|
||||||
RUN pip3 install six
|
RUN pip3 install six
|
||||||
|
29
Pipfile
29
Pipfile
@ -8,22 +8,23 @@ verify_ssl = true
|
|||||||
name = "pypi"
|
name = "pypi"
|
||||||
|
|
||||||
[packages]
|
[packages]
|
||||||
flask = "~=2.0.1"
|
flask = "==2.0.3"
|
||||||
python-dotenv = "~=0.17.1"
|
python-dotenv = "==0.17.1"
|
||||||
flask-migrate = "~=3.0.1"
|
flask-migrate = "==3.0.1"
|
||||||
flask-sqlalchemy = "~=2.5.1"
|
flask-sqlalchemy = "==2.5.1"
|
||||||
sqlalchemy = "~=1.4.18"
|
sqlalchemy = "==1.4.53"
|
||||||
waitress = "~=2.0.0"
|
waitress = "==2.1.2"
|
||||||
pyyaml = "~=6.0.1"
|
pyyaml = "==6.0.2"
|
||||||
flask-cors = "~=3.0.10"
|
flask-cors = "==3.0.10"
|
||||||
ldap3 = "~=2.9"
|
ldap3 = "==2.9.1"
|
||||||
pymysql = "~=1.0.2"
|
pymysql = "==1.0.3"
|
||||||
|
werkzeug = "==2.3.8"
|
||||||
|
|
||||||
[dev-packages]
|
[dev-packages]
|
||||||
flake8 = "~=3.9.2"
|
flake8 = "==3.9.2"
|
||||||
yapf = "~=0.31.0"
|
yapf = "==0.31.0"
|
||||||
pre-commit = "~=2.13.0"
|
pre-commit = "==2.13.0"
|
||||||
reuse = "~=0.13.0"
|
reuse = "==0.14.0"
|
||||||
|
|
||||||
[requires]
|
[requires]
|
||||||
python_version = "3.8"
|
python_version = "3.8"
|
||||||
|
965
Pipfile.lock
generated
965
Pipfile.lock
generated
File diff suppressed because it is too large
Load Diff
18
renovate.json
Normal file
18
renovate.json
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
|
"extends": [
|
||||||
|
"config:best-practices",
|
||||||
|
":disableDependencyDashboard",
|
||||||
|
":maintainLockFilesMonthly",
|
||||||
|
":pinVersions",
|
||||||
|
":separateMultipleMajorReleases"
|
||||||
|
],
|
||||||
|
"packageRules": [
|
||||||
|
{
|
||||||
|
"matchDepNames": ["python"],
|
||||||
|
"groupName": "Python",
|
||||||
|
"separateMinorPatch": true,
|
||||||
|
"separateMultipleMinor": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
Reference in New Issue
Block a user