Merge branch 'master' into patch-2

This commit is contained in:
Vicente Reyes 2023-12-02 11:09:22 +08:00 committed by GitHub
commit 5c71257ef5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 7 deletions

View File

@ -1478,5 +1478,10 @@
"name": "Christian Jauvin",
"github_login": "cjauvin",
"twitter_username": ""
},
{
"name": "Plurific",
"github_login": "paulschwenn",
"twitter_username": ""
}
]

View File

@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
<!-- GENERATOR_PLACEHOLDER -->
## 2023.11.30
### Fixed
- Removed tmp mount in devcontainer.json. Fix #4686 ([#4708](https://github.com/cookiecutter/cookiecutter-django/pull/4708))
### Updated
- Bump traefik from 2.10.5 to 2.10.6 ([#4706](https://github.com/cookiecutter/cookiecutter-django/pull/4706))
## 2023.11.29

View File

@ -1650,6 +1650,13 @@ Listed in alphabetical order.
</td>
<td></td>
</tr>
<tr>
<td>Plurific</td>
<td>
<a href="https://github.com/paulschwenn">paulschwenn</a>
</td>
<td></td>
</tr>
<tr>
<td>Raony Guimarães Corrêa</td>
<td>

View File

@ -5,7 +5,7 @@ except ImportError:
from distutils.core import setup
# We use calendar versioning
version = "2023.11.29"
version = "2023.11.30"
with open("README.md") as readme_file:
long_description = readme_file.read()

View File

@ -11,11 +11,6 @@
"target": "/home/dev-user/.bash_history",
"type": "bind"
},
{
"source": "/tmp",
"target": "/tmp",
"type": "bind"
},
{
"source": "~/.ssh",
"target": "/home/dev-user/.ssh",

View File

@ -1,4 +1,4 @@
FROM traefik:2.10.5
FROM traefik:2.10.6
RUN mkdir -p /etc/traefik/acme \
&& touch /etc/traefik/acme/acme.json \
&& chmod 600 /etc/traefik/acme/acme.json