diff --git a/.circleci/config.yml b/.circleci/config.yml index 24fdced6..3bbd095e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -163,14 +163,30 @@ jobs: # # Note that the job name should match the EDX_RELEASE value - # No changes detected for dogwood.3-fun - # No changes detected for eucalyptus.3-bare - # No changes detected for eucalyptus.3-wb - # No changes detected for hawthorn.1-bare - # No changes detected for hawthorn.1-oee - # No changes detected for ironwood.2-bare - # No changes detected for ironwood.2-oee - # No changes detected for master.0-bare + # Run jobs for the dogwood.3-fun release + dogwood.3-fun: + <<: [*defaults, *build_steps] + # Run jobs for the eucalyptus.3-bare release + eucalyptus.3-bare: + <<: [*defaults, *build_steps] + # Run jobs for the eucalyptus.3-wb release + eucalyptus.3-wb: + <<: [*defaults, *build_steps] + # Run jobs for the hawthorn.1-bare release + hawthorn.1-bare: + <<: [*defaults, *build_steps] + # Run jobs for the hawthorn.1-oee release + hawthorn.1-oee: + <<: [*defaults, *build_steps] + # Run jobs for the ironwood.2-bare release + ironwood.2-bare: + <<: [*defaults, *build_steps] + # Run jobs for the ironwood.2-oee release + ironwood.2-oee: + <<: [*defaults, *build_steps] + # Run jobs for the master.0-bare release + master.0-bare: + <<: [*defaults, *build_steps] # Hub job hub: @@ -259,14 +275,62 @@ workflows: # Build jobs - # No changes detected so no job to run for dogwood.3-fun - # No changes detected so no job to run for eucalyptus.3-bare - # No changes detected so no job to run for eucalyptus.3-wb - # No changes detected so no job to run for hawthorn.1-bare - # No changes detected so no job to run for hawthorn.1-oee - # No changes detected so no job to run for ironwood.2-bare - # No changes detected so no job to run for ironwood.2-oee - # No changes detected so no job to run for master.0-bare + # Run jobs for the dogwood.3-fun release + - dogwood.3-fun: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the eucalyptus.3-bare release + - eucalyptus.3-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the eucalyptus.3-wb release + - eucalyptus.3-wb: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the hawthorn.1-bare release + - hawthorn.1-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the hawthorn.1-oee release + - hawthorn.1-oee: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the ironwood.2-bare release + - ironwood.2-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the ironwood.2-oee release + - ironwood.2-oee: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ + # Run jobs for the master.0-bare release + - master.0-bare: + requires: + - check-configuration + filters: + tags: + ignore: /.*/ # We are pushing to Docker only images that are the result of a tag respecting the pattern: # **{branch-name}-x.y.z** diff --git a/releases/dogwood/3/fun/CHANGELOG.md b/releases/dogwood/3/fun/CHANGELOG.md index ad4749aa..c0005609 100644 --- a/releases/dogwood/3/fun/CHANGELOG.md +++ b/releases/dogwood/3/fun/CHANGELOG.md @@ -9,6 +9,10 @@ release. ## [Unreleased] +### Fixed + +- Set `SESSION_COOKIE_SECURE` to True by default + ## [dogwood.3-fun-2.3.1] - 2021-08-19 ### Fixed diff --git a/releases/dogwood/3/fun/config/cms/docker_run_production.py b/releases/dogwood/3/fun/config/cms/docker_run_production.py index fab0463b..f913b6b5 100644 --- a/releases/dogwood/3/fun/config/cms/docker_run_production.py +++ b/releases/dogwood/3/fun/config/cms/docker_run_production.py @@ -226,7 +226,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_ENGINE = config("SESSION_ENGINE", default="redis_sessions.session") SESSION_SAVE_EVERY_REQUEST = config( diff --git a/releases/dogwood/3/fun/config/lms/docker_run_production.py b/releases/dogwood/3/fun/config/lms/docker_run_production.py index 0efd8095..058cf75d 100644 --- a/releases/dogwood/3/fun/config/lms/docker_run_production.py +++ b/releases/dogwood/3/fun/config/lms/docker_run_production.py @@ -183,7 +183,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_ENGINE = config("SESSION_ENGINE", default="redis_sessions.session") SESSION_SAVE_EVERY_REQUEST = config( diff --git a/releases/eucalyptus/3/bare/CHANGELOG.md b/releases/eucalyptus/3/bare/CHANGELOG.md index 909b70b8..5fccbd5b 100644 --- a/releases/eucalyptus/3/bare/CHANGELOG.md +++ b/releases/eucalyptus/3/bare/CHANGELOG.md @@ -11,6 +11,7 @@ release. ### Fixed +- Set `SESSION_COOKIE_SECURE` to True by default - Fix build after get-pip.py script moved location ## [eucalyptus.3-1.2.0] - 2020-05-14 diff --git a/releases/eucalyptus/3/bare/config/cms/docker_run_production.py b/releases/eucalyptus/3/bare/config/cms/docker_run_production.py index 705fd5cd..9d6beb26 100644 --- a/releases/eucalyptus/3/bare/config/cms/docker_run_production.py +++ b/releases/eucalyptus/3/bare/config/cms/docker_run_production.py @@ -210,7 +210,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_ENGINE = config( "SESSION_ENGINE", default="django.contrib.sessions.backends.cache" diff --git a/releases/eucalyptus/3/bare/config/lms/docker_run_production.py b/releases/eucalyptus/3/bare/config/lms/docker_run_production.py index c5107bdc..cbb08f45 100644 --- a/releases/eucalyptus/3/bare/config/lms/docker_run_production.py +++ b/releases/eucalyptus/3/bare/config/lms/docker_run_production.py @@ -184,7 +184,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/eucalyptus/3/wb/CHANGELOG.md b/releases/eucalyptus/3/wb/CHANGELOG.md index 58cf4433..63540b56 100644 --- a/releases/eucalyptus/3/wb/CHANGELOG.md +++ b/releases/eucalyptus/3/wb/CHANGELOG.md @@ -9,6 +9,10 @@ release. ## [Unreleased] +### Fixed + +- Set `SESSION_COOKIE_SECURE` to True by default + ## [eucalyptus.3-wb-1.10.0] - 2021-08-17 ### Changed diff --git a/releases/eucalyptus/3/wb/config/cms/docker_run_production.py b/releases/eucalyptus/3/wb/config/cms/docker_run_production.py index 543e9be2..ed93da64 100644 --- a/releases/eucalyptus/3/wb/config/cms/docker_run_production.py +++ b/releases/eucalyptus/3/wb/config/cms/docker_run_production.py @@ -214,7 +214,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_ENGINE = config("SESSION_ENGINE", default="redis_sessions.session") SESSION_SAVE_EVERY_REQUEST = config( diff --git a/releases/eucalyptus/3/wb/config/lms/docker_run_production.py b/releases/eucalyptus/3/wb/config/lms/docker_run_production.py index 09fa714a..598fa779 100644 --- a/releases/eucalyptus/3/wb/config/lms/docker_run_production.py +++ b/releases/eucalyptus/3/wb/config/lms/docker_run_production.py @@ -183,7 +183,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_ENGINE = config("SESSION_ENGINE", default="redis_sessions.session") SESSION_SAVE_EVERY_REQUEST = config( diff --git a/releases/hawthorn/1/bare/CHANGELOG.md b/releases/hawthorn/1/bare/CHANGELOG.md index 3a1141c5..eebf3274 100644 --- a/releases/hawthorn/1/bare/CHANGELOG.md +++ b/releases/hawthorn/1/bare/CHANGELOG.md @@ -11,6 +11,7 @@ release. ### Fixed +- Set `SESSION_COOKIE_SECURE` to True by default - Fix build by installing py2neo 3.1.2 from its github repository - Fix build after get-pip.py script moved location - Fix pip install for python 2.7 diff --git a/releases/hawthorn/1/bare/config/cms/docker_run_production.py b/releases/hawthorn/1/bare/config/cms/docker_run_production.py index 91bb9319..e0588025 100644 --- a/releases/hawthorn/1/bare/config/cms/docker_run_production.py +++ b/releases/hawthorn/1/bare/config/cms/docker_run_production.py @@ -203,7 +203,7 @@ "SESSION_ENGINE", default="django.contrib.sessions.backends.cache" ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/hawthorn/1/bare/config/lms/docker_run_production.py b/releases/hawthorn/1/bare/config/lms/docker_run_production.py index 87b01e87..ec12203a 100644 --- a/releases/hawthorn/1/bare/config/lms/docker_run_production.py +++ b/releases/hawthorn/1/bare/config/lms/docker_run_production.py @@ -164,7 +164,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/hawthorn/1/oee/CHANGELOG.md b/releases/hawthorn/1/oee/CHANGELOG.md index bc2683bf..c669099f 100644 --- a/releases/hawthorn/1/oee/CHANGELOG.md +++ b/releases/hawthorn/1/oee/CHANGELOG.md @@ -11,6 +11,7 @@ release. ### Fixed +- Set `SESSION_COOKIE_SECURE` to True by default - Fix build by installing py2neo 3.1.2 from its github repository - Fix build after get-pip.py script moved location diff --git a/releases/hawthorn/1/oee/config/cms/docker_run_production.py b/releases/hawthorn/1/oee/config/cms/docker_run_production.py index 647bfbbf..682669cc 100644 --- a/releases/hawthorn/1/oee/config/cms/docker_run_production.py +++ b/releases/hawthorn/1/oee/config/cms/docker_run_production.py @@ -209,7 +209,7 @@ SESSION_ENGINE = config("SESSION_ENGINE", default="redis_sessions.session") SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/hawthorn/1/oee/config/lms/docker_run_production.py b/releases/hawthorn/1/oee/config/lms/docker_run_production.py index be9697bb..0acebe5f 100644 --- a/releases/hawthorn/1/oee/config/lms/docker_run_production.py +++ b/releases/hawthorn/1/oee/config/lms/docker_run_production.py @@ -198,7 +198,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/ironwood/2/bare/CHANGELOG.md b/releases/ironwood/2/bare/CHANGELOG.md index b85423e0..2d98ba10 100644 --- a/releases/ironwood/2/bare/CHANGELOG.md +++ b/releases/ironwood/2/bare/CHANGELOG.md @@ -11,6 +11,7 @@ release. ### Fixed +- Set `SESSION_COOKIE_SECURE` to True by default - Fix build by installing py2neo 3.1.2 from its github repository - Fix pip install for python 2.7 diff --git a/releases/ironwood/2/bare/config/cms/docker_run_production.py b/releases/ironwood/2/bare/config/cms/docker_run_production.py index 7499d738..6cde571b 100644 --- a/releases/ironwood/2/bare/config/cms/docker_run_production.py +++ b/releases/ironwood/2/bare/config/cms/docker_run_production.py @@ -208,7 +208,7 @@ "SESSION_ENGINE", default="django.contrib.sessions.backends.cache" ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/ironwood/2/bare/config/lms/docker_run_production.py b/releases/ironwood/2/bare/config/lms/docker_run_production.py index 6ba9f65d..71fe581e 100644 --- a/releases/ironwood/2/bare/config/lms/docker_run_production.py +++ b/releases/ironwood/2/bare/config/lms/docker_run_production.py @@ -163,7 +163,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/ironwood/2/oee/CHANGELOG.md b/releases/ironwood/2/oee/CHANGELOG.md index 777d386a..bdb954c4 100644 --- a/releases/ironwood/2/oee/CHANGELOG.md +++ b/releases/ironwood/2/oee/CHANGELOG.md @@ -11,6 +11,7 @@ release. ### Fixed +- Set `SESSION_COOKIE_SECURE` to True by default - Fix build by installing py2neo 3.1.2 from its github repository ## [ironwood.2-oee-1.0.4] - 2021-03-04 diff --git a/releases/ironwood/2/oee/config/cms/docker_run_production.py b/releases/ironwood/2/oee/config/cms/docker_run_production.py index dfe95f26..691b2dee 100644 --- a/releases/ironwood/2/oee/config/cms/docker_run_production.py +++ b/releases/ironwood/2/oee/config/cms/docker_run_production.py @@ -213,7 +213,7 @@ SESSION_ENGINE = config("SESSION_ENGINE", default="redis_sessions.session") SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/ironwood/2/oee/config/lms/docker_run_production.py b/releases/ironwood/2/oee/config/lms/docker_run_production.py index 9e910624..f24c398b 100644 --- a/releases/ironwood/2/oee/config/lms/docker_run_production.py +++ b/releases/ironwood/2/oee/config/lms/docker_run_production.py @@ -197,7 +197,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/master/0/bare/CHANGELOG.md b/releases/master/0/bare/CHANGELOG.md index ba2230cc..27182153 100644 --- a/releases/master/0/bare/CHANGELOG.md +++ b/releases/master/0/bare/CHANGELOG.md @@ -13,10 +13,4 @@ release. ## [Unreleased] -### Fixed - -- Fix build by installing py2neo 3.1.2 from its github repository -- Fix build after get-pip.py script moved location -- Fix pip install for python 2.7 - [unreleased]: https://github.com/openfun/openedx-docker diff --git a/releases/master/0/bare/config/cms/docker_run_production.py b/releases/master/0/bare/config/cms/docker_run_production.py index c0b343c7..7df20281 100644 --- a/releases/master/0/bare/config/cms/docker_run_production.py +++ b/releases/master/0/bare/config/cms/docker_run_production.py @@ -204,7 +204,7 @@ "SESSION_ENGINE", default="django.contrib.sessions.backends.cache" ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool diff --git a/releases/master/0/bare/config/lms/docker_run_production.py b/releases/master/0/bare/config/lms/docker_run_production.py index dd858e24..7418833c 100644 --- a/releases/master/0/bare/config/lms/docker_run_production.py +++ b/releases/master/0/bare/config/lms/docker_run_production.py @@ -164,7 +164,7 @@ "SESSION_COOKIE_HTTPONLY", default=True, formatter=bool ) SESSION_COOKIE_SECURE = config( - "SESSION_COOKIE_SECURE", default=SESSION_COOKIE_SECURE, formatter=bool + "SESSION_COOKIE_SECURE", default=True, formatter=bool ) SESSION_SAVE_EVERY_REQUEST = config( "SESSION_SAVE_EVERY_REQUEST", default=SESSION_SAVE_EVERY_REQUEST, formatter=bool