35 Commits

Author SHA1 Message Date
Roland Geider
10bec7544c Cleanup 2026-01-09 19:55:56 +01:00
Roland Geider
1c276ed3d7 Set PYTHONPATH 2026-01-09 16:03:50 +01:00
Roland Geider
a8ba6fe2d6 Refactor the way the settings are handled.
Instead of a "create-settings" command, which didn't contain all the options
and was a bit awkward, we now have specific settings used for different things.
2025-12-28 21:32:44 +01:00
Roland Geider
19509c534b Fix path for static files 2025-10-16 21:25:24 +02:00
Roland Geider
b38d4bcd0e Use the sass binary from npm 2025-10-16 21:16:14 +02:00
Roland Geider
a3b0b96b29 Also copy the css map file 2025-10-16 21:04:29 +02:00
Roland Geider
acd42d0488 Copy the files from react-components manually
This allows us to keep the size of the node_modules folder at a somewhat
more manegable size.
2025-10-16 20:19:23 +02:00
Roland Geider
564e65d334 Update paths in docker file 2025-10-11 21:51:44 +02:00
Roland Geider
0eecb1954a Use "npm ci" when installing in github actions 2025-10-11 20:45:25 +02:00
Roland Geider
909361f6ec Refactor project to use packaged version of our react component
This gets rid of the checked-in react code, which was causing huge diffs
2025-10-11 16:46:24 +02:00
Roland Geider
0911741288 Combine RUN steps 2025-06-26 15:49:07 +02:00
Roland Geider
9e878dcd02 Some cleanup of the demo Dockerfile 2025-06-25 19:44:18 +02:00
Roland Geider
c509e045aa Also compile the react application
This makes sure the frontend and its translations are always up to date.
2025-06-25 17:22:15 +02:00
hangy
81aff98c2c docs: Fix demo container name 2025-05-25 11:47:47 +02:00
Roland Geider
a814bae43b Move dependencies to pyproject.toml
Update CI workflows, docker files, etc.
2025-04-27 19:42:29 +02:00
Roland Geider
1e8d62f21c Refactor demo Dockerfile
This now also gets js and css files in the builder stage
2024-10-02 20:32:49 +02:00
Roland Geider
fbe30e0c24 Remove extending the path variable, this is not needed here 2024-10-02 19:58:15 +02:00
Roland Geider
2be0ce11d9 Correctly build all docker images 2024-10-01 22:54:07 +02:00
Roland Geider
2baa28f65c Use hatchling as the build backend, this seems to make less problems 2024-01-27 11:48:15 +01:00
Roland Geider
325502e10f Don't install in editable mode 2024-01-27 11:01:44 +01:00
Roland Geider
8da48f87bd Move project metadata to pyproject.toml 2024-01-16 15:31:31 +01:00
Roland Geider
d050767c9b Replace further appearances of twitter with mastodon 2023-11-26 14:06:26 +01:00
Roland Geider
431d3132c7 Perform an apt update in the builder stage before installing the dependencies 2023-08-20 16:57:54 +02:00
Roland Geider
e845b3172e Don't do an apt update
We're using the base image which has already done that. Also don't delete
the apt cache since an automatic apt clear happens as well
2023-07-11 22:34:57 +02:00
Roland Geider
5d5849e119 Copy from correct folder 2023-07-11 19:50:08 +02:00
Roland Geider
6905f4f283 Use same image name as above 2023-07-11 19:19:23 +02:00
Roland Geider
02697acdf0 Update installed packages
* remove git, which was not used
* use the base image for building, which saves us installing one or two things
* add a bunch of stuff so that the images build for arm/v7
2023-07-11 18:27:44 +02:00
Roland Geider
490480ec5c Install additional necessary packages 2023-05-07 13:18:41 +02:00
Roland Geider
0eecc3f9cf Use correct base docker image 2022-11-30 14:43:33 +01:00
Roland Geider
e37be09681 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	angular/src/locale/messages.pt.xlf
#	requirements.txt
#	wger/core/management/commands/extract-i18n.py
#	wger/exercises/api/serializers.py
#	wger/exercises/api/views.py
2022-05-09 12:41:21 +02:00
Roland Geider
4075a3541d Fix configuration problem with apache
Fixes #1039
2022-05-08 16:01:41 +02:00
Roland Geider
a22a6ca0d1 Update ubuntu to 22.04 2022-04-22 14:02:03 +02:00
Roland Geider
ed2d7be5d7 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	.github/workflows/ci.yml
#	angular/package.json
#	requirements.txt
#	wger/urls.py
2021-11-19 10:59:55 +01:00
Roland Geider
d3d2ab192f Remove last mentions of wger/apache image 2021-10-01 10:46:53 +02:00
Roland Geider
3db6b38ece Rename apache image to demo
That's the image's purpose and which server is used is no important
2021-10-01 10:43:17 +02:00