Merge branch 'develop'

remove healthcheck
2025-12-30 13:40:01 -05:00 · 2025-01-05 11:38:52 +01:00 · 2025-01-05 11:38:35 +01:00 · 2025-01-01 09:24:51 +01:00 · 2025-01-01 08:16:19 +01:00 · 2025-01-01 00:33:49 +00:00
2 changed files with 7 additions and 6 deletions
--- a/11
+++ b/11
@@ -35,11 +35,12 @@ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-de
 #Copy project and execute it.
 COPY . ./

-HEALTHCHECK --interval=30s \
-            --timeout=5s \
-            --start-period=10s \
-            --retries=3 \
-            CMD [ "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:8080/openapi" ]
+# commented for now https://github.com/TandoorRecipes/recipes/issues/3478
+#HEALTHCHECK --interval=30s \
+#            --timeout=5s \
+#            --start-period=10s \
+#            --retries=3 \
+#            CMD [ "/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:8080/openapi" ]

 # collect information from git repositories
 RUN /opt/recipes/venv/bin/python version.py
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 Django==4.2.17
-cryptography===43.0.1
+cryptography===44.0.0
 django-annoying==0.10.6
 django-cleanup==8.0.0
 django-crispy-forms==2.3
Author	SHA1	Message	Date
vabene1111	738aa12243	Merge branch 'develop'	2025-01-05 11:38:52 +01:00
vabene1111	f25de4b4ce	remove healthcheck	2025-01-05 11:38:35 +01:00
vabene1111	698aa5a753	Merge branch 'develop'	2025-01-01 09:24:51 +01:00
vabene1111	6444680e06	Merge pull request #3475 from TandoorRecipes/dependabot/pip/cryptography-44.0.0 Bump cryptography from 43.0.1 to 44.0.0	2025-01-01 08:16:19 +01:00
dependabot[bot]	c604369e86	Bump cryptography from 43.0.1 to 44.0.0 Bumps [cryptography](https://github.com/pyca/cryptography) from 43.0.1 to 44.0.0. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/43.0.1...44.0.0) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-01-01 00:33:49 +00:00