mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-12-23 07:23:46 +00:00
Change the way the dev docker works
This commit is contained in:
parent
9426218117
commit
8c797929c1
1 changed files with 8 additions and 0 deletions
|
@ -1,12 +1,20 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
# cat docker/settings_local.template.py | envsubst > re2o/settings_local.py
|
# cat docker/settings_local.template.py | envsubst > re2o/settings_local.py
|
||||||
cp docker/settings_local.template.py re2o/settings_local.py
|
cp docker/settings_local.template.py re2o/settings_local.py
|
||||||
|
|
||||||
>>>>>>> 33bacb65 (Add decouple)
|
>>>>>>> 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
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue