Wykres commitów

76 Commity (main)

Autor SHA1 Wiadomość Data
Sævar Öfjörð Magnússon 6e03972979 Upgrade to node version 20 2023-11-11 22:30:13 +00:00
John-Scott Atlakson 849497e87a Removed `bakerydemo-settings-local.py.example`
This file never worked, it caused a circular import loop since it attempts to `from bakerydemo.settings.dev import *` but the dev settings does:

```python
try:
    from .local import *  # noqa
except ImportError:
    pass
```

Fixed the `setup.sh` script to set the correct settings module environment variable

Fixes #68
2023-11-11 21:58:05 +00:00
John-Scott Atlakson 0d4b9c6335 Remove uninterpreted environment variable from `docker-compose.yml`
This caused a spurious warning when running `docker compose` commands because `$PYTHONPATH` is not defined on the docker _host_ and docker attempted to interpret it as if it were any other environment variable e.g. `$DB_USER`, etc.

All it accomplished was to add a non-existent directory to the path:

```bash
docker compose run web bash
root@2bc54a69fd5c:/code/bakerydemo# echo $PYTHONPATH
/code/wagtail:/code/bakerydemo:$PYTHONPATH

root@2bc54a69fd5c:/code/bakerydemo# python -c "import sys; print('\n'.join(sys.path))"

/code/wagtail
/code/bakerydemo
/code/bakerydemo/$PYTHONPATH
/usr/local/lib/python38.zip
/usr/local/lib/python3.8
/usr/local/lib/python3.8/lib-dynload
/usr/local/lib/python3.8/site-packages
/code/willow
```

Fixes #56
2023-11-11 13:16:25 +00:00
LB (Ben Johnston) 9479945080
Update README.md (#65)
Include cross-reference to Wagtail's Vagrant development setup. Useful for those that get stuck with / cannot use Docker.
2023-09-26 21:05:38 +00:00
Jhonatan Lopes e90654533d
Wagtail repo format and lint make commands (#60)
* Fix docstring

* Install make on frontend container

* Lint and format commands

* Update readme
2023-09-21 21:23:11 +00:00
LB (Ben Johnston) bdb87e6fbe
Remove TODO from the README (#63)
- This is function on Windows & Linux, bugs can be raised if needed, see related #46 #35 #31 (all closed)
- Elasticsearch/Opensearch Docker container is already an issue #3 (still open)
2023-09-21 21:14:23 +00:00
LB (Ben Johnston) 0803de9936
Format README with Prettier (#62)
- Fixes a few confusing whitespace/code snippet nesting issues
2023-09-21 21:13:43 +00:00
LB (Ben Johnston) 387c3f7142
Fix a few small typos in the Readme (#61) 2023-09-21 21:13:03 +00:00
Florian Ellis 281c6dbd87
Add bakerydemo local settings example file and fix setup script accordingly (#54) (#55)
* Add example file for bakerydemo/bakerydemo/settings/local.py (#54)

* Copy example file to bakerydemo/bakerydemo/settings/local.py in setup.sh script
2023-03-09 13:00:57 +00:00
LB (Ben Johnston) 9ee767966e
Update Node to v18 (#50) 2023-02-08 16:34:28 +00:00
LB (Ben Johnston) a413530b55
Ensure that `file=` will actually work when passing into make test (#49) 2023-02-08 16:31:15 +00:00
Sævar Öfjörð Magnússon eef885dc79
Refrain from running scripts through shell 2022-10-14 10:10:42 +00:00
Sævar Öfjörð Magnússon 30d7aeeadd
Combatability issue with Windows fixed.
According to information from https://stackoverflow.com/a/36885829/291505 and issue #46
2022-10-14 09:54:00 +00:00
Jaspreet singh e6ee6816e2
fix typo in dockerfile (#44) 2022-06-18 10:49:22 +02:00
Sævar Öfjörð Magnússon a3e149af2d Merge branch 'main' of github.com:wagtail/docker-wagtail-develop 2022-06-17 00:36:25 +02:00
Sævar Öfjörð Magnússon 7ba9d32408 Add documentation about contributing to Willow 2022-06-16 16:21:49 +02:00
Steve Stein 75a90827d9
Add makefile for docker commands (#43)
* Create makefile

* Update readme with makefile commands

* Update readme spacing and sh comments

* Add back line that was taken out in readme

* stop and down rename in makefile

* Updates as per feedback

* Update readme to include raw docker commands as well as makefile ones
2022-05-12 09:21:47 +00:00
Jake Howard a19af88852
Add VSCode dev container configuration (#24) 2022-03-29 12:49:17 +00:00
Sævar Öfjörð Magnússon 865cd10515
Create docker-image.yml (#41)
* Create docker-image.yml

* Testing
2022-02-28 09:50:44 +00:00
Sævar Öfjörð Magnússon fd3d1a4c6c
Update README.md 2022-02-28 09:39:01 +00:00
sag᠎e 6f3c8f619a
Add instruction to open a PostgreSQL shell session (#40) 2022-02-28 09:26:27 +00:00
Thibaud Colas c0675bc90f Ignore .vscode folder 2022-02-04 10:50:36 +00:00
Thibaud Colas bea200be96 Switch emails to wagtail.org 2022-02-04 10:49:34 +00:00
Thibaud Colas 99699d0149
Upgrade to Node 16 (#39) 2022-02-01 20:58:29 +00:00
Sævar Öfjörð Magnússon 307e00729d
Update README.md 2022-01-19 15:39:31 +00:00
Sævar Öfjörð Magnússon 2a7b0dd4cc
Update README.md 2022-01-18 15:12:14 +00:00
Sævar Öfjörð Magnússon a0e731f937
Improved the speed of the frontend build. (#38) 2022-01-18 13:19:52 +00:00
Sævar Öfjörð Magnússon a0d0721734
Update readme with info on how to run tests with correct working directory (#37) 2022-01-18 10:21:23 +00:00
Sævar Öfjörð Magnússon 9b6e9c9878
Enclose strings in quotes to avoid syntax errors in YAML parsing, specifically the error yaml: line 20: mapping values are not allowed in this context (#33) 2021-09-03 23:23:35 +00:00
Tibor Leupold 121d6fc71e
Update Dockerfile for Debian Bullseye release (#32)
* Update Dockerfile for Debian Bullseye release

The previously used base image `python:3.7` was changed to now use
Debian Bullseye. This lead to installation issues of `libenchant-dev`
(see #31).

This is now fixed by upgrading the installation command for `libenchant`
to `libenchant-2-dev` (see also https://pkgs.org/search/?q=LIBENCHANT).

Additionally, to avoid similar issues in the future, the Debian version
of the base image is now defined in the `Dockerfile`.

* Upgrade Python base image from 3.7 to 3.8
2021-09-03 23:16:43 +00:00
LB (Ben Johnston) f7b8fc9f76
Update Dockerfile.frontend to Node v14 (#30)
- relates to https://github.com/wagtail/wagtail/issues/7473
2021-09-04 00:00:07 +02:00
Naomi I. Morduch Toubman b6faf81f89
Add documentation re how to run tests (#29) 2021-07-13 19:00:38 +00:00
Tibor Leupold 6c2e500273
Prevent automatic container restarts (#28)
Automatic container restarts are not necessary in a development context.

Also, working on multiple projects with these settings only leads to
an extreme load on the dev machine, because all the containers from
all the projects are starting when the Docker engine is started.
2021-07-01 15:59:27 +00:00
sankalpmukim 572067059f
Update cloning instructions in README to use HTTPS instead of SSH (#27)
Now git clone using the recommended http method rather than the earlier git@github method.
2021-04-12 15:57:29 -04:00
Thibaud Colas 1bae2678b1
Fix typo 2021-03-04 22:08:11 +00:00
Thibaud Colas 69e12dad54
Fix typo in README 2021-03-04 21:58:52 +00:00
Cynthia Kiser 230934edaf Install postgresql-client so we can use 'manage.py dbshell' 2021-02-04 13:20:19 -08:00
Cynthia Kiser 09ae6c40a9
Merge pull request #19 from thibaudcolas/chore/frontend-commands
Clean up front-end container Dockerfile
2021-02-03 16:42:32 -08:00
Thibaud Colas 30ada01a13 Clean up front-end container Dockerfile 2020-10-23 21:21:46 +01:00
Cynthia Kiser 8b8d78f3cc
Automate setting up bakerydemo to use the Postgres db in services (#15)
* Update the README with instructions on getting bakerydemo to use the PostgreSQL database from the adjacent container
* Corrected formatting in README
* Automated setting up bakerydemo to use the postgres service from our docker-compose
2020-10-21 17:25:48 +00:00
Robert Rollins 43782a1533
Reworked the database and Wagtail installation setup (#18)
* Broke out the initial database stuff into a separate one-time script.

Also enhanced the .dockerignore file to make image builds a lot faster, and added .idea to the .gitignire, so that PyCharm projects won't get added to the repo.

* Reworked the database and Wagtail installation setup

In order to improve the development experience while using docker-wagtail-develop, I reorganized how the database setup is done, and how and when Wagtail gets installed into the python environment inside the docker container. Plus a few other changes.

1. Database. The migration and initial data load steps are now done once, by the user, during initial setup (setup-sb.sh), rather than happening at the start of every `docker-compose up`. This is possible because the postgres data is already being stored in a Docker Volume, so it persists across container executions.

2. Wagtail is now installed into the 'web' docker container by the Dockerfile, rather than docker-compose. This lets Docker skip that step if nothing has changed in Wagtail since the last build (admittedly, not super common, given that this project is for developing Wagtail), and generally makes the whole process a lot cleaner.

3. I added a bunch of stuff to .dockerignore, which significantly cuts down on the 'web' and 'frontend' images filesizes and build times.

4. I gave each of the three containers specific names, so that they can be more easily executed into for things like running manage.py commands or other OS stuff. This resulted in the connect string for the postgres DB needing to be tweaked.

5. I changed the 'frontend' container's copy command for the node_modules folder to use the -u flag, which allows cp to skip any files that haven't changed since the last time the copy was run. This *dramatically* speeds up the startup of the 'frontend' container on all but the very first execution (which does the initial copy into the host's wagtail folder).

I really wanted to find a way to put node_modules into a Docker Volume, but since you can't write to Volumes during the image build process, that unfortunately negates any value-add that we might have gotten from their use in this case.
2020-10-09 16:58:58 +00:00
Sævar Öfjörð Magnússon f473083142
Merge pull request #16 from marteinn/additional_linux_fixes
Drop unnecessary user from web container
2020-10-07 15:06:16 +00:00
Sævar Öfjörð Magnússon 7a916ea0f8
Merge pull request #17 from marteinn/add_update_command
Add command for updating repos
2020-10-06 10:17:12 +00:00
Martin Sandström e80dc4eb66 Add command for updating repos 2020-08-07 06:49:12 +02:00
Martin Sandström 12add8c227 Drop unecessary user from web container 2020-08-06 06:42:11 +02:00
Cynthia Kiser 1d77f71861
Merge pull request #14 from wagtail/docker-compose-improvements
Add a volume for Postgres data
2020-08-01 10:11:21 -07:00
Dan Braghis 44d13d910a Add a volume for Postgres data 2020-08-01 17:29:58 +01:00
Sævar Öfjörð Magnússon 82d03eb272
Merge pull request #13 from lb-/lb--patch-2
Update .gitignore
2020-07-16 22:01:30 +00:00
LB (Ben Johnston) 7aabe5c4fc
Update .gitignore
add .DS_Store (macOS)
2020-07-15 16:31:32 +10:00
Sævar Öfjörð Magnússon 10d4d0e762
Merge pull request #12 from lb-/lb--patch-1
Update Readme - add section for frontend bash
2020-07-12 20:27:17 +00:00