Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Sun, 29 Jan 2023 15:29:38 UTC Commit: 1083b2a9c0d779533f34ef20360217f7002d976b https://github.com/geany/www.geany.org/commit/1083b2a9c0d779533f34ef20360217...

Log Message: ----------- Update local Docker setup and use Debian Bullseye as base image

Modified Paths: -------------- database.json docker/Dockerfile docker/irc_userlist

Modified: database.json 216 lines changed, 8 insertions(+), 208 deletions(-) =================================================================== @@ -231,22 +231,6 @@ "app_label": "latest_version" } }, - { - "model": "contenttypes.contenttype", - "pk": 30, - "fields": { - "model": "query", - "app_label": "twitter" - } - }, - { - "model": "contenttypes.contenttype", - "pk": 31, - "fields": { - "model": "tweet", - "app_label": "twitter" - } - }, { "model": "contenttypes.contenttype", "pk": 32, @@ -499,33 +483,6 @@ "name": "SSL_FORCE_HOST" } }, - { - "model": "conf.setting", - "pk": 26, - "fields": { - "site": 1, - "value": "search", - "name": "TWITTER_DEFAULT_QUERY_TYPE" - } - }, - { - "model": "conf.setting", - "pk": 27, - "fields": { - "site": 1, - "value": "5", - "name": "TWITTER_DEFAULT_NUM_TWEETS" - } - }, - { - "model": "conf.setting", - "pk": 28, - "fields": { - "site": 1, - "value": "#geany", - "name": "TWITTER_DEFAULT_QUERY" - } - }, { "model": "conf.setting", "pk": 29, @@ -544,42 +501,6 @@ "name": "RATINGS_ACCOUNT_REQUIRED" } }, - { - "model": "conf.setting", - "pk": 57, - "fields": { - "site": 1, - "value": "", - "name": "TWITTER_CONSUMER_SECRET" - } - }, - { - "model": "conf.setting", - "pk": 58, - "fields": { - "site": 1, - "value": "", - "name": "TWITTER_ACCESS_TOKEN_KEY" - } - }, - { - "model": "conf.setting", - "pk": 59, - "fields": { - "site": 1, - "value": "", - "name": "TWITTER_CONSUMER_KEY" - } - }, - { - "model": "conf.setting", - "pk": 60, - "fields": { - "site": 1, - "value": "", - "name": "TWITTER_ACCESS_TOKEN_SECRET" - } - }, { "model": "conf.setting", "pk": 62, @@ -1006,32 +927,6 @@ "in_menus": "1" } }, - { - "model": "pages.page", - "pk": 19, - "fields": { - "_meta_title": null, - "short_url": null, - "_order": 1, - "content_model": "richtextpage", - "title": "IRC", - "created": "2019-02-24T22:25:22Z", - "keywords_string": "", - "titles": "Support / IRC", - "status": 2, - "site": 1, - "in_sitemap": true, - "gen_description": true, - "login_required": false, - "slug": "support/irc", - "publish_date": "2019-02-24T22:25:22Z", - "updated": "2019-05-31T13:30:48Z", - "expiry_date": null, - "description": "IRC chat\nIf you have a problem, a question or anything else to talk about, join our IRC channel irc://chat.freenode.net/geany|#geany on chat.freenode.net.", - "parent": 17, - "in_menus": "1,2,3" - } - }, { "model": "pages.page", "pk": 20, @@ -1852,13 +1747,6 @@ "content": "Bugs and Features\n==========\n\nIf you think you found a bug in Geany or if you have a feature to request, please file bugs at the Github issue tracker(see below).\nYou can also feel free to subscribe and write to our [mailing list][1].\n\n### Github issue tracker\n\nThe issue tracker can be used for bugs as well as feature requests:\n\nhttps://github.com/geany/geany/issues%5Cn%5CnSometimes a bug is not caused by Geany itself but by a plugin.\nIf you know or assume it might be a plugin, please refer to the Geany-Plugins project for reporting:\n\nhttps://github.com/geany/geany-plugins/issues%5Cn%5Cn%5Cn### Bug reports\n\nPlease try to give us reliable instructions to reproduce the bug, so we can diagnose the cause. We also need:\n\n - The version number of Geany\n - The version number of GTK+ (can be printed with `geany -V`)\n - Your OS details\n - The filetype the bug occurred with (if applicable)\n\n### Other useful information\n\nGeany prints useful information on the command-line when run with the `-v` switch.\nThis can be useful to diagnose a bug.\n\nSometimes you might find a bug that only occurs with a certain configuration - in this case it can be helpful if you send us your `~/.geany/geany.conf` and any other concerned configuration file (where `~` is your home directory).\n\n### Getting a backtrace\n\nIf Geany crashed, it would also help us a lot if you can give us a backtrace made using `gdb`:\n\n - Run `gdb /path/to/geany` (Note: the usual path can be found by running `which geany`)\n - Type `run -v` (followed by any command-line arguments you used with Geany when the bug occurred) in the `gdb` prompt\n - Reproduce the segfault - it will be caught by `gdb`\n - Type `bt` and press enter if prompted\n\nSend us everything from the `run` command - thanks.\n\nIn some cases the backtrace may not be that useful.\nThis mostly happens when Geany was built without debug information, useful information was removed by using `-fomit-frame-pointer` or the binary was stripped (but it may still be worth sending it to us).\n\nIn this case it would be great if you could either:\n\n - Get a backtrace from a debug package of Geany (if your distro has one) or\n - Get a backtrace from a fresh Geany build with appropriate debug flags:\n\n * `make clean`\n * `./configure CFLAGS=-g`\n * Then build Geany with `make`, etc.\n\nThis also prevents optimization flags (usually enabled e.g. `-O2`) from inlining static functions where the bug might be hiding.\n\nNote: a default source configure with gcc should include the `-g` debug flag, but on some systems CFLAGS is already set either by autoconf or in the shell environment, so it may need overriding.\n\n\n [1]: /support/mailing-lists/\n" } }, - { - "model": "pages.richtextpage", - "pk": 19, - "fields": { - "content": "IRC chat\n==========\n\nIf you have a problem, a question or anything else to talk about, join our IRC channel irc://chat.freenode.net/geany|#geany on chat.freenode.net.\n\n**Due to spam, as of 2018-08-01, you need to be registered and identified** with Freenode's account service to speak in geany-affiliated channels.\n\nFollow freenode's instructions: https://freenode.net/kb/answer/registration.\n\nIRC channel logs: https://irc.geany.org/logs/.%5Cn%5CnIRC channel stats: https://irc.geany.org/stats/.%5Cn" - } - }, { "model": "pages.richtextpage", "pk": 23, @@ -2114,37 +2002,21 @@ } }, { - "model": "twitter.query", + "model": "latest_version.latestversion", "pk": 1, "fields": { - "interested": false, - "type": "search", - "value": "geany" - } - }, - { - "model": "twitter.query", - "pk": 2, - "fields": { - "interested": false, - "type": "search", - "value": "django mezzanine" - } - }, - { - "model": "twitter.query", - "pk": 3, - "fields": { - "interested": true, - "type": "search", - "value": "#geany" + "version": "1.35", + "name": "Geany", + "release_date": "2019-04-28T16:36:53Z", + "github_link": "/commits/1.35.0" } }, { "model": "latest_version.latestversion", - "pk": 1, + "pk": 2, "fields": { "version": "1.35", + "name": "Geany-Plugins", "release_date": "2019-04-28T16:36:53Z", "github_link": "/commits/1.35.0" } @@ -2955,60 +2827,6 @@ "name": "Can delete latest version" } }, - { - "model": "auth.permission", - "pk": 89, - "fields": { - "content_type": 30, - "codename": "add_query", - "name": "Can add Twitter query" - } - }, - { - "model": "auth.permission", - "pk": 90, - "fields": { - "content_type": 30, - "codename": "change_query", - "name": "Can change Twitter query" - } - }, - { - "model": "auth.permission", - "pk": 91, - "fields": { - "content_type": 30, - "codename": "delete_query", - "name": "Can delete Twitter query" - } - }, - { - "model": "auth.permission", - "pk": 92, - "fields": { - "content_type": 31, - "codename": "add_tweet", - "name": "Can add Tweet" - } - }, - { - "model": "auth.permission", - "pk": 93, - "fields": { - "content_type": 31, - "codename": "change_tweet", - "name": "Can change Tweet" - } - }, - { - "model": "auth.permission", - "pk": 94, - "fields": { - "content_type": 31, - "codename": "delete_tweet", - "name": "Can delete Tweet" - } - }, { "model": "auth.permission", "pk": 95, @@ -3450,24 +3268,6 @@ "name": "Can view Gallery" } }, - { - "model": "auth.permission", - "pk": 156, - "fields": { - "content_type": 30, - "codename": "view_query", - "name": "Can view Twitter query" - } - }, - { - "model": "auth.permission", - "pk": 157, - "fields": { - "content_type": 31, - "codename": "view_tweet", - "name": "Can view Tweet" - } - }, { "model": "auth.permission", "pk": 158, @@ -4746,4 +4546,4 @@ "user_permissions": [] } } -] \ No newline at end of file +]

Modified: docker/Dockerfile 9 lines changed, 4 insertions(+), 5 deletions(-) =================================================================== @@ -23,7 +23,7 @@ # docker run --rm -it --user "$(id --user):$(id --group)" --mount "type=bind,src=$(pwd),dst=/app" -p 8000:8000 --name geany_dev geany_dev:latest

# Intermediate build container -FROM debian:stretch-slim AS builder +FROM debian:bullseye-slim AS builder

ENV LANG=C.UTF-8 \ DEBIAN_FRONTEND=noninteractive \ @@ -32,7 +32,6 @@ ENV LANG=C.UTF-8 \ PYTHONUNBUFFERED=1 \ PIP_DISABLE_PIP_VERSION_CHECK=1 \ PIP_FORMAT="columns" \ - PIP_NO_BINARY=":all:" \ PIP_CACHE_DIR="/tmp/pip" \ PIP_TIMEOUT=60

@@ -59,12 +58,12 @@ USER nobody:nogroup COPY requirements.txt /data/ # Install Python deps RUN python3 -m venv --copies /venv && \ - /venv/bin/pip install -U pip setuptools && \ + /venv/bin/pip install -U pip setuptools wheel && \ /venv/bin/pip install -r /data/requirements.txt

# App container -FROM debian:stretch-slim AS app +FROM debian:bullseye-slim AS app

ENV LANG=C.UTF-8 \ DEBIAN_FRONTEND=noninteractive \ @@ -80,7 +79,7 @@ RUN apt-get update && \ ca-certificates \ intltool \ libjpeg62-turbo \ - libmariadbclient18 \ + default-mysql-client \ libmemcached11 \ libssl1.1 \ python3 \

Modified: docker/irc_userlist 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -1,5 +0,0 @@ -dummy-user-1 -dummy-user-2 -dummy-user-3 -dummy-user-4 -dummy-user-5

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).