From d0e52e423e5e5740b716e8f2cf3f0ab195738252 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sun, 1 Aug 2021 01:00:46 +0200
Subject: [PATCH] move package build dependencies to docker image
---
.gitlab-ci.yml | 5 -----
uwsgi.ini | 14 ++++++++------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 869d5225..45ca0a57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,6 @@ before_script:
build:pip:
extends: .build
script:
- - pip3 install build
- PACKAGE_VERSION="${UFFD_PACKAGE_VERSION}" python3 -m build
artifacts:
paths:
@@ -28,8 +27,6 @@ build:pip:
build:apt:
extends: .build
script:
- - apt update
- - apt-get install -y python3-all debhelper python3-pip git-buildpackage
- cp CHANGELOG debian/changelog
- export PYBUILD_INSTALL_ARGS="--install-lib=/usr/share/uffd/ --install-scripts=/usr/share/uffd/"
- gbp dch --ignore-branch --debian-tag=v%\(version\)s
@@ -117,7 +114,6 @@ test:package:apt:
stage: test
script:
- apt -y install ./build/*.deb
- - apt -y install curl
- ln -s /etc/uffd/uwsgi.ini /etc/uwsgi/apps-available/uffd.ini
- ln -s /etc/uwsgi/apps-available/uffd.ini /etc/uwsgi/apps-enabled/uffd.ini
- service uwsgi start uffd || ( service uwsgi status uffd ; sleep 15; cat /var/log/uwsgi/app/uffd.log; )
@@ -137,7 +133,6 @@ test:package:apt:
publish:pip:
extends: .publish
script:
- - pip3 install twine
- TWINE_USERNAME="${GITLABPKGS_USERNAME}" TWINE_PASSWORD="${GITLABPKGS_PASSWORD}" python3 -m twine upload --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*
- TWINE_USERNAME="${PYPI_USERNAME}" TWINE_PASSWORD="${PYPI_PASSWORD}" python3 -m twine upload dist/*
dependencies:
diff --git a/uwsgi.ini b/uwsgi.ini
index 2fc06205..183b56ea 100644
--- a/uwsgi.ini
+++ b/uwsgi.ini
@@ -1,16 +1,18 @@
[uwsgi]
plugin = python3
-env = PYTHONIOENCODING=UTF-8
-env = LANG=en_GB.utf8
-env = TZ=Europe/Berlin
-env = CONFIG_FILENAME=/etc/uffd/uffd.cfg
manage-script-name = true
-chdir = /usr/share/uffd
-module = uffd:create_app()
+workers = %k*2
uid = uffd
gid = uffd
vacuum = true
+env = PYTHONIOENCODING=UTF-8
+env = LANG=en_GB.utf8
+env = TZ=Europe/Berlin
+env = CONFIG_FILENAME=/etc/uffd/uffd.cfg
+chdir = /usr/share/uffd
+module = uffd:create_app()
+
hook-pre-app = exec:FLASK_APP=uffd flask db upgrade
--
GitLab