rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-21 19:03:11 +00:00
Code Issues Releases Wiki Activity

Oopsi

Browse source
This commit is contained in:
chapeau 2024-03-08 09:55:50 +01:00
parent 7bf67f9fe1
commit 2261c23b89
2 changed files with 1 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
docker/docker-entrypoint.sh
View file

@ -1,40 +1,17 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
<<<<<<< HEAD
<<<<<<< HEAD
=======
# cat docker/settings_local.template.py | envsubst > re2o/settings_local.py
cp docker/settings_local.template.py re2o/settings_local.py
>>>>>>> 33bacb65 (Add decouple)
=======
# cat docker/settings_local.template.py | envsubst > re2o/settings_local.py
cp docker/settings_local.template.py re2o/settings_local.py
=======
>>>>>>> ab75f416 (Change the way the dev docker works)
>>>>>>> 907fc353 (Change the way the dev docker works)
cp -n cotisations/templates/cotisations/invoice.html templates/default_invoice.html cp -n cotisations/templates/cotisations/invoice.html templates/default_invoice.html
cp -n cotisations/templates/cotisations/voucher.html templates/default_voucher.html cp -n cotisations/templates/cotisations/voucher.html templates/default_voucher.html
AUTOMIGRATE=${AUTOMIGRATE:-yes} AUTOMIGRATE=${AUTOMIGRATE:-yes}
if [ "$AUTOMIGRATE" != "skip" ]; then if [ "$AUTOMIGRATE" != "skip" ]; then
<<<<<<< HEAD
poetry run python manage.py migrate --noinput poetry run python manage.py migrate --noinput
=======
poetry run python3 manage.py migrate --noinput
>>>>>>> a62566ef (premier essai)
fi fi
<<<<<<< HEAD
poetry run python manage.py collectstatic poetry run python manage.py collectstatic
poetry run python manage.py compilemessages poetry run python manage.py compilemessages
=======
poetry run python3 manage.py collectstatic
poetry run python3 manage.py compilemessages
>>>>>>> a58d4dca (update pip requirements)
cat <<EOF | poetry run python manage.py shell cat <<EOF | poetry run python manage.py shell
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
@ -44,4 +21,4 @@ User = get_user_model()
User.objects.filter(pseudo='$SUPERUSER_LOGIN').exists() or \ User.objects.filter(pseudo='$SUPERUSER_LOGIN').exists() or \
User.objects.create_superuser(pseudo='$SUPERUSER_LOGIN', email='$SUPERUSER_EMAIL', password='$SUPERUSER_PASS', surname='$SUPERUSER_LOGIN') User.objects.create_superuser(pseudo='$SUPERUSER_LOGIN', email='$SUPERUSER_EMAIL', password='$SUPERUSER_PASS', surname='$SUPERUSER_LOGIN')
EOF EOF
poetry run python manage.py runserver 0.0.0.0:8000 poetry run python manage.py runserver 0.0.0.0:8000

12
poetry.lock generated
View file

@ -2165,16 +2165,4 @@ postgresql = ["psycopg2"]
[metadata] [metadata]
lock-version = "2.0" lock-version = "2.0"
python-versions = ">=3.8,<4.0" python-versions = ">=3.8,<4.0"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
content-hash = "35c7fcf4285d44bb7287cb8d9573f327beec53c61979faae77a8c077c2560930" content-hash = "35c7fcf4285d44bb7287cb8d9573f327beec53c61979faae77a8c077c2560930"
=======
content-hash = "2ee7b73659d0ea743ca62e05d7dd39be39a3f8cbb61688aa0e58bd728c3e21ce"
>>>>>>> db0c57af (premier essai)
=======
content-hash = "638f084a0a517296e8a9f376d2f5b1495db4b951da0f608d7d96d91ad088cf08"
>>>>>>> fb5f4ad3 (lock)
=======
content-hash = "e3b482272ea83061d7f895adf661243b4b2b96cac5c61a69295977f0d7464f3f"
>>>>>>> 33bacb65 (Add decouple)