From ba91d6fb727b436ac02f1c6d1ab636b6073c44fd Mon Sep 17 00:00:00 2001 From: Mario Colombo Date: Fri, 1 Oct 2021 12:20:39 +0200 Subject: [PATCH 1/9] use frozen requirements --- Dockerfile | 2 +- README.md | 4 + requirements.in | 37 +++++++++ requirements.txt | 208 +++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 217 insertions(+), 34 deletions(-) create mode 100644 requirements.in diff --git a/Dockerfile b/Dockerfile index 10bcf34..d4c56fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8 +FROM python:3.9 WORKDIR /app COPY . /app RUN pip install -r requirements.txt diff --git a/README.md b/README.md index 898b402..709a7bd 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,10 @@ see sections that can be removed - in each case, the section is noted with a com Options are also available for using Postgres/MySQL, uWSGI/Gunicorn/Guvicorn, etc. +#### Updating requirements + +The project uses a 2 step approach, freezing all dependencies with pip-tools. Read more about how to handle it here: https://blog.typodrive.com/2020/02/04/always-freeze-requirements-with-pip-compile-to-avoid-unpleasant-surprises/ + ## Features ### Static Files with Whitenoise diff --git a/requirements.in b/requirements.in new file mode 100644 index 0000000..13c00f3 --- /dev/null +++ b/requirements.in @@ -0,0 +1,37 @@ +django>=3.1,<3.2 # 3.2 has dark admin theme which looks bad in custom django CMS admin views +dj-database-url==0.5.0 +django-storage-url==0.5.0 +whitenoise==5.2.0 +boto3==1.14.49 + +psycopg2==2.8.5 + +uwsgi==2.0.19.1 + +# key requirements for django CMS +django-cms<4 +django-classy-tags>=2.0 +django-sekizai>=2.0 +six +pytz + +# optional, but used in most projects +djangocms-admin-style>=2.0,<3.0 + +# the default CKEditor - optional, but used in most projects +djangocms-text-ckeditor>=4.0,<5.0 + +# some content plugins - optional, but used in most projects +djangocms-link>=3.0,<4.0 +djangocms-icon>=2.0,<3.0 +djangocms-style>=3.0,<4.0 +djangocms-googlemap>=2.0,<3.0 +djangocms-video>=3.0,<4.0 +djangocms-file>=3.0,<4.0 +djangocms-picture>=3.0,<4.0 + +# optional django CMS Bootstrap 5 modules (alpha) - requires BS5 frontend setup in the templates +https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5 + +# Django Filer - optional, but used in most projects (alpha) +https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer diff --git a/requirements.txt b/requirements.txt index 13c00f3..e80fc6a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,37 +1,179 @@ -django>=3.1,<3.2 # 3.2 has dark admin theme which looks bad in custom django CMS admin views +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# pip-compile requirements.in +# +asgiref==3.4.1 + # via django +boto3==1.14.49 + # via -r requirements.in +botocore==1.17.63 + # via + # boto3 + # s3transfer +cssselect2==0.4.1 + # via svglib dj-database-url==0.5.0 + # via -r requirements.in +django==3.1.13 + # via + # -r requirements.in + # django-classy-tags + # django-cms + # django-filer + # django-formtools + # django-polymorphic + # django-sekizai + # django-storages + # django-treebeard + # easy-thumbnails +django-classy-tags==2.0.0 + # via + # -r requirements.in + # django-cms + # django-sekizai +django-cms==3.9.0 + # via + # -r requirements.in + # djangocms-attributes-field + # djangocms-bootstrap5 + # djangocms-file + # djangocms-googlemap + # djangocms-icon + # djangocms-link + # djangocms-picture + # djangocms-style + # djangocms-text-ckeditor + # djangocms-video +django-filer @ https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip + # via + # -r requirements.in + # djangocms-bootstrap5 + # djangocms-file + # djangocms-googlemap + # djangocms-link + # djangocms-picture + # djangocms-video +django-formtools==2.3 + # via django-cms +django-js-asset==1.2.2 + # via django-mptt +django-mptt==0.13.4 + # via django-filer +django-polymorphic==3.0.0 + # via django-filer +django-sekizai==2.0.0 + # via + # -r requirements.in + # django-cms django-storage-url==0.5.0 -whitenoise==5.2.0 -boto3==1.14.49 - + # via -r requirements.in +django-storages==1.11.1 + # via django-storage-url +django-treebeard==4.5.1 + # via django-cms +djangocms-admin-style==2.0.2 + # via + # -r requirements.in + # django-cms +djangocms-attributes-field==2.0.0 + # via + # djangocms-bootstrap5 + # djangocms-file + # djangocms-icon + # djangocms-link + # djangocms-picture + # djangocms-style + # djangocms-video +djangocms-bootstrap5 @ https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip + # via -r requirements.in +djangocms-file==3.0.0 + # via -r requirements.in +djangocms-googlemap==2.0.0 + # via -r requirements.in +djangocms-icon==2.0.0 + # via + # -r requirements.in + # djangocms-bootstrap5 +djangocms-link==3.0.0 + # via + # -r requirements.in + # djangocms-bootstrap5 +djangocms-picture==3.0.0 + # via + # -r requirements.in + # djangocms-bootstrap5 +djangocms-style==3.0.0 + # via -r requirements.in +djangocms-text-ckeditor==4.0.0 + # via + # -r requirements.in + # djangocms-bootstrap5 +djangocms-video==3.0.0 + # via -r requirements.in +docutils==0.15.2 + # via botocore +easy-thumbnails==2.8rc0 + # via + # django-filer + # djangocms-picture +furl==2.1.3 + # via django-storage-url +html5lib==1.1 + # via djangocms-text-ckeditor +jmespath==0.10.0 + # via + # boto3 + # botocore +lxml==4.6.3 + # via svglib +orderedmultidict==1.0.1 + # via furl +pillow==8.3.2 + # via + # djangocms-text-ckeditor + # easy-thumbnails + # reportlab psycopg2==2.8.5 - + # via -r requirements.in +python-dateutil==2.8.2 + # via botocore +pytz==2021.1 + # via + # -r requirements.in + # django +reportlab==3.6.1 + # via + # easy-thumbnails + # svglib +s3transfer==0.3.7 + # via boto3 +six==1.16.0 + # via + # -r requirements.in + # furl + # html5lib + # orderedmultidict + # python-dateutil +sqlparse==0.4.2 + # via django +svglib==1.1.0 + # via easy-thumbnails +tinycss2==1.1.0 + # via + # cssselect2 + # svglib +unidecode==1.1.2 + # via django-filer +urllib3==1.25.11 + # via botocore uwsgi==2.0.19.1 - -# key requirements for django CMS -django-cms<4 -django-classy-tags>=2.0 -django-sekizai>=2.0 -six -pytz - -# optional, but used in most projects -djangocms-admin-style>=2.0,<3.0 - -# the default CKEditor - optional, but used in most projects -djangocms-text-ckeditor>=4.0,<5.0 - -# some content plugins - optional, but used in most projects -djangocms-link>=3.0,<4.0 -djangocms-icon>=2.0,<3.0 -djangocms-style>=3.0,<4.0 -djangocms-googlemap>=2.0,<3.0 -djangocms-video>=3.0,<4.0 -djangocms-file>=3.0,<4.0 -djangocms-picture>=3.0,<4.0 - -# optional django CMS Bootstrap 5 modules (alpha) - requires BS5 frontend setup in the templates -https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5 - -# Django Filer - optional, but used in most projects (alpha) -https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer + # via -r requirements.in +webencodings==0.5.1 + # via + # cssselect2 + # html5lib + # tinycss2 +whitenoise==5.2.0 + # via -r requirements.in From 2da98054ba1306c1b61dba79e9d12ec332b9a061 Mon Sep 17 00:00:00 2001 From: jpVm5jYYRE1VIKL Date: Mon, 11 Oct 2021 16:11:44 +0200 Subject: [PATCH 2/9] Update docker-compose.yml Move to fresh compose and fix issue #17 --- docker-compose.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 08cdc5d..c52bdb6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,9 @@ -version: "2.4" +version: "3" + services: web: # the application's web service (container) will use an image based on our Dockerfile - build: "." + build: . # map the internal port 80 to port 8000 on the host ports: - "8000:80" @@ -13,19 +14,27 @@ services: # the default command to run whenever the container is launched command: python manage.py runserver 0.0.0.0:80 # the URL 'postgres' or 'mysql' will point to the application's db service - links: - - "database_default" + networks: + - djangocmsnet + env_file: .env-local database_default: # Select one of the following db configurations for the database image: postgres:9.6-alpine ports: - - "5432:5432" # allow your local dev env to connect to the db + - "5432:5432/tcp" # allow your local dev env to connect to the db environment: POSTGRES_DB: "db" POSTGRES_PASSWORD: "password" POSTGRES_HOST_AUTH_METHOD: "trust" SERVICE_MANAGER: "fsm-postgres" + + networks: + - djangocmsnet + volumes: - ".:/app:rw" + +networks: + djangocmsnet: From 69798243e5e5a7760f79c5090a3cfeeaeb2330da Mon Sep 17 00:00:00 2001 From: Mario Colombo Date: Wed, 20 Oct 2021 17:04:38 +0200 Subject: [PATCH 3/9] revert to bs4 (as bs5 is still a bit broken) --- backend/settings.py | 36 ++++++++++++++++++------------------ backend/templates/base.html | 8 ++++++-- requirements.in | 12 +++++++++++- requirements.txt | 30 +++++++++--------------------- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/backend/settings.py b/backend/settings.py index 1fb2542..eaf6fb2 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -62,22 +62,22 @@ 'djangocms_googlemap', 'djangocms_video', - # optional django CMS Bootstrap 5 modules - 'djangocms_bootstrap5', - 'djangocms_bootstrap5.contrib.bootstrap5_alerts', - 'djangocms_bootstrap5.contrib.bootstrap5_badge', - 'djangocms_bootstrap5.contrib.bootstrap5_card', - 'djangocms_bootstrap5.contrib.bootstrap5_carousel', - 'djangocms_bootstrap5.contrib.bootstrap5_collapse', - 'djangocms_bootstrap5.contrib.bootstrap5_content', - 'djangocms_bootstrap5.contrib.bootstrap5_grid', - 'djangocms_bootstrap5.contrib.bootstrap5_jumbotron', - 'djangocms_bootstrap5.contrib.bootstrap5_link', - 'djangocms_bootstrap5.contrib.bootstrap5_listgroup', - 'djangocms_bootstrap5.contrib.bootstrap5_media', - 'djangocms_bootstrap5.contrib.bootstrap5_picture', - 'djangocms_bootstrap5.contrib.bootstrap5_tabs', - 'djangocms_bootstrap5.contrib.bootstrap5_utilities', + # optional django CMS Bootstrap 4 modules + 'djangocms_bootstrap4', + 'djangocms_bootstrap4.contrib.bootstrap4_alerts', + 'djangocms_bootstrap4.contrib.bootstrap4_badge', + 'djangocms_bootstrap4.contrib.bootstrap4_card', + 'djangocms_bootstrap4.contrib.bootstrap4_carousel', + 'djangocms_bootstrap4.contrib.bootstrap4_collapse', + 'djangocms_bootstrap4.contrib.bootstrap4_content', + 'djangocms_bootstrap4.contrib.bootstrap4_grid', + 'djangocms_bootstrap4.contrib.bootstrap4_jumbotron', + 'djangocms_bootstrap4.contrib.bootstrap4_link', + 'djangocms_bootstrap4.contrib.bootstrap4_listgroup', + 'djangocms_bootstrap4.contrib.bootstrap4_media', + 'djangocms_bootstrap4.contrib.bootstrap4_picture', + 'djangocms_bootstrap4.contrib.bootstrap4_tabs', + 'djangocms_bootstrap4.contrib.bootstrap4_utilities', ] MIDDLEWARE = [ @@ -129,8 +129,8 @@ ('whitenoise-static-files-demo.html', 'Static File Demo'), # optional templates that extend base.html, to be used with Bootstrap 5 - ('page.html', 'Bootstrap5 Demo'), - ('feature.html', 'Bootstrap5 Demo with two placeholders') + ('page.html', 'Bootstrap 4 Demo'), + ('feature.html', 'Bootstrap 4 Demo with two placeholders') ] WSGI_APPLICATION = 'backend.wsgi.application' diff --git a/backend/templates/base.html b/backend/templates/base.html index 76680d1..f628a2a 100644 --- a/backend/templates/base.html +++ b/backend/templates/base.html @@ -5,7 +5,8 @@ {% block title %}This is my new project home page{% endblock title %} - + + {% render_block "css" %} @@ -26,8 +27,11 @@ {% block content %}{% endblock content %} + - + + + {% render_block "js" %} diff --git a/requirements.in b/requirements.in index 13c00f3..4b08102 100644 --- a/requirements.in +++ b/requirements.in @@ -1,3 +1,7 @@ +# Compile this file for changes to take effect: +# pip-compile requirements.in >> requirements.txt + + django>=3.1,<3.2 # 3.2 has dark admin theme which looks bad in custom django CMS admin views dj-database-url==0.5.0 django-storage-url==0.5.0 @@ -30,8 +34,14 @@ djangocms-video>=3.0,<4.0 djangocms-file>=3.0,<4.0 djangocms-picture>=3.0,<4.0 + +# optional django CMS Bootstrap 4 modules +djangocms-bootstrap4>=2.0,<3.0 # optional django CMS Bootstrap 5 modules (alpha) - requires BS5 frontend setup in the templates -https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5 +# as of Q4 2021 there are still basic issues with djangocms-bootstrap5 +# https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5 # Django Filer - optional, but used in most projects (alpha) https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer + +pip-tools # needed for compilation of this file into requirements.txt, see start of file diff --git a/requirements.txt b/requirements.txt index e80fc6a..73bf5c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,9 +21,7 @@ django==3.1.13 # -r requirements.in # django-classy-tags # django-cms - # django-filer # django-formtools - # django-polymorphic # django-sekizai # django-storages # django-treebeard @@ -37,7 +35,7 @@ django-cms==3.9.0 # via # -r requirements.in # djangocms-attributes-field - # djangocms-bootstrap5 + # djangocms-bootstrap4 # djangocms-file # djangocms-googlemap # djangocms-icon @@ -49,7 +47,7 @@ django-cms==3.9.0 django-filer @ https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip # via # -r requirements.in - # djangocms-bootstrap5 + # djangocms-bootstrap4 # djangocms-file # djangocms-googlemap # djangocms-link @@ -57,12 +55,6 @@ django-filer @ https://github.com/django-cms/django-filer/archive/refs/tags/2.1r # djangocms-video django-formtools==2.3 # via django-cms -django-js-asset==1.2.2 - # via django-mptt -django-mptt==0.13.4 - # via django-filer -django-polymorphic==3.0.0 - # via django-filer django-sekizai==2.0.0 # via # -r requirements.in @@ -79,14 +71,14 @@ djangocms-admin-style==2.0.2 # django-cms djangocms-attributes-field==2.0.0 # via - # djangocms-bootstrap5 + # djangocms-bootstrap4 # djangocms-file # djangocms-icon # djangocms-link # djangocms-picture # djangocms-style # djangocms-video -djangocms-bootstrap5 @ https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip +djangocms-bootstrap4==2.0.0 # via -r requirements.in djangocms-file==3.0.0 # via -r requirements.in @@ -95,29 +87,27 @@ djangocms-googlemap==2.0.0 djangocms-icon==2.0.0 # via # -r requirements.in - # djangocms-bootstrap5 + # djangocms-bootstrap4 djangocms-link==3.0.0 # via # -r requirements.in - # djangocms-bootstrap5 + # djangocms-bootstrap4 djangocms-picture==3.0.0 # via # -r requirements.in - # djangocms-bootstrap5 + # djangocms-bootstrap4 djangocms-style==3.0.0 # via -r requirements.in djangocms-text-ckeditor==4.0.0 # via # -r requirements.in - # djangocms-bootstrap5 + # djangocms-bootstrap4 djangocms-video==3.0.0 # via -r requirements.in docutils==0.15.2 # via botocore easy-thumbnails==2.8rc0 - # via - # django-filer - # djangocms-picture + # via djangocms-picture furl==2.1.3 # via django-storage-url html5lib==1.1 @@ -164,8 +154,6 @@ tinycss2==1.1.0 # via # cssselect2 # svglib -unidecode==1.1.2 - # via django-filer urllib3==1.25.11 # via botocore uwsgi==2.0.19.1 From 76339089be400afb6031562236001af16c7df965 Mon Sep 17 00:00:00 2001 From: Simon Krull Date: Fri, 19 Nov 2021 14:59:12 +0100 Subject: [PATCH 4/9] TASK: Update dependencies for django-filer (#23) --- requirements.in | 4 ++-- requirements.txt | 24 ++++++++++++++++++++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/requirements.in b/requirements.in index 4b08102..a98528d 100644 --- a/requirements.in +++ b/requirements.in @@ -34,7 +34,7 @@ djangocms-video>=3.0,<4.0 djangocms-file>=3.0,<4.0 djangocms-picture>=3.0,<4.0 - +easy-thumbnails==2.8.0 # optional django CMS Bootstrap 4 modules djangocms-bootstrap4>=2.0,<3.0 # optional django CMS Bootstrap 5 modules (alpha) - requires BS5 frontend setup in the templates @@ -42,6 +42,6 @@ djangocms-bootstrap4>=2.0,<3.0 # https://github.com/gl-agnx/djangocms-bootstrap5/archive/refs/heads/master.zip#egg=djangocms_bootstrap5 # Django Filer - optional, but used in most projects (alpha) -https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip#egg=django-filer +https://github.com/django-cms/django-filer/archive/refs/tags/2.1.1.zip#egg=django-filer pip-tools # needed for compilation of this file into requirements.txt, see start of file diff --git a/requirements.txt b/requirements.txt index 73bf5c7..2e1c0a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with python 3.8 +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile requirements.in @@ -12,6 +12,8 @@ botocore==1.17.63 # via # boto3 # s3transfer +click==8.0.3 + # via pip-tools cssselect2==0.4.1 # via svglib dj-database-url==0.5.0 @@ -44,7 +46,7 @@ django-cms==3.9.0 # djangocms-style # djangocms-text-ckeditor # djangocms-video -django-filer @ https://github.com/django-cms/django-filer/archive/refs/tags/2.1rc4.zip +django-filer @ https://github.com/django-cms/django-filer/archive/refs/tags/2.1.1.zip # via # -r requirements.in # djangocms-bootstrap4 @@ -106,8 +108,10 @@ djangocms-video==3.0.0 # via -r requirements.in docutils==0.15.2 # via botocore -easy-thumbnails==2.8rc0 - # via djangocms-picture +easy-thumbnails==2.8.0 + # via + # -r requirements.in + # djangocms-picture furl==2.1.3 # via django-storage-url html5lib==1.1 @@ -120,11 +124,15 @@ lxml==4.6.3 # via svglib orderedmultidict==1.0.1 # via furl +pep517==0.12.0 + # via pip-tools pillow==8.3.2 # via # djangocms-text-ckeditor # easy-thumbnails # reportlab +pip-tools==6.4.0 + # via -r requirements.in psycopg2==2.8.5 # via -r requirements.in python-dateutil==2.8.2 @@ -154,6 +162,8 @@ tinycss2==1.1.0 # via # cssselect2 # svglib +tomli==1.2.2 + # via pep517 urllib3==1.25.11 # via botocore uwsgi==2.0.19.1 @@ -163,5 +173,11 @@ webencodings==0.5.1 # cssselect2 # html5lib # tinycss2 +wheel==0.37.0 + # via pip-tools whitenoise==5.2.0 # via -r requirements.in + +# The following packages are considered to be unsafe in a requirements file: +# pip +# setuptools From 6b5bf9f2d3e32ef0d0dde46cb91e147663f3e406 Mon Sep 17 00:00:00 2001 From: Simon Krull Date: Wed, 13 Apr 2022 20:40:20 +0200 Subject: [PATCH 5/9] TASK: update versions for django-cms and djangocms-admin-style (#28) --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 2e1c0a7..e067eed 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,7 +33,7 @@ django-classy-tags==2.0.0 # -r requirements.in # django-cms # django-sekizai -django-cms==3.9.0 +django-cms==3.10.0 # via # -r requirements.in # djangocms-attributes-field @@ -67,7 +67,7 @@ django-storages==1.11.1 # via django-storage-url django-treebeard==4.5.1 # via django-cms -djangocms-admin-style==2.0.2 +djangocms-admin-style==3.1.1 # via # -r requirements.in # django-cms From e6555a9019287bf1e6ee7f40b19ca1b2eff358bc Mon Sep 17 00:00:00 2001 From: Simon Krull Date: Wed, 13 Apr 2022 22:22:35 +0200 Subject: [PATCH 6/9] TASK: increase django version regarding dark mode support/ EOL of django 3.1 (#29) * TASK: increase django version regarding dark mode support * TASK: bump django version to 3.2.13 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e067eed..fc20bc9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ cssselect2==0.4.1 # via svglib dj-database-url==0.5.0 # via -r requirements.in -django==3.1.13 +django==3.2.13 # via # -r requirements.in # django-classy-tags From b5e258da35837d261b313c32e8fc7361ed2fb236 Mon Sep 17 00:00:00 2001 From: Abdur-Rahmaan Janhangeer Date: Thu, 28 Apr 2022 14:04:13 +0400 Subject: [PATCH 7/9] Update README.md: Add note about docker compose (#27) * Update README.md * Update README.md Co-authored-by: Simon Krull * Update README.md Co-authored-by: Simon Krull Co-authored-by: Simon Krull --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0fbf440..86d8ff7 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,9 @@ docker compose up -d Then open http://django-cms-quickstart.127.0.0.1.nip.io:8000 (or just http://127.0.0.1:8000) in your browser. +Note: Since Compose V2, `docker-compose` is now included inside docker. For more information, checkout the [Compose V2](https://docs.docker.com/compose/cli-command/) Documentation. +You can find more information at https://docs.docker.com/compose/cli-command/ + ## Customising the project This project is ready-to-go without making any changes at all, but also gives you some options. From d7a706297ede393ec8f972eb1d5271a625af1b5d Mon Sep 17 00:00:00 2001 From: Simon Krull Date: Thu, 28 Apr 2022 13:58:08 +0200 Subject: [PATCH 8/9] TASK: Delete unused line in README (#30) --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 86d8ff7..1cbd6a3 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,6 @@ docker compose up -d Then open http://django-cms-quickstart.127.0.0.1.nip.io:8000 (or just http://127.0.0.1:8000) in your browser. Note: Since Compose V2, `docker-compose` is now included inside docker. For more information, checkout the [Compose V2](https://docs.docker.com/compose/cli-command/) Documentation. -You can find more information at https://docs.docker.com/compose/cli-command/ ## Customising the project From fc177b24abfcf8ccd5ca50c0d31051ec7afeb5e4 Mon Sep 17 00:00:00 2001 From: Richard Johnson Date: Wed, 4 May 2022 12:21:56 -0400 Subject: [PATCH 9/9] Update postgres image to 13.5 (#31) Divio migrated the databases from postgress 9.6 to 13. More info: https://www.divio.com/blog/postgres_migration_from_9_6_to_13/ --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c52bdb6..402f5cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: database_default: # Select one of the following db configurations for the database - image: postgres:9.6-alpine + image: postgres:13.5-alpine ports: - "5432:5432/tcp" # allow your local dev env to connect to the db environment: