Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20241007 misc #975

Merged
merged 11 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ runs:
using: composite
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build Images
shell: bash
run: docker compose build ${{ inputs.images }}
Expand Down
3 changes: 2 additions & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM python:3.11.8-alpine
# wait for https://github.com/gabrielfalcao/HTTPretty/issues/474 before bumping
FROM python:3.11-alpine

COPY --from=trajano/alpine-libfaketime /faketime.so /lib/libfaketime.so
RUN mkdir -p /etc/faketime
Expand Down
10 changes: 5 additions & 5 deletions api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ django-cors-headers~=4.4.0
djangorestframework~=3.14.0
django-celery-email~=3.0.0
django-netfields~=1.3.2
django-pgtrigger~=4.11.1
django-pgtrigger~=4.12.2
django-prometheus~=2.3.1
dnspython~=2.6.1
httpretty~=1.0.5 # 1.1 breaks tests. Does not run in production, so stick to it.
pyotp~=2.9.0
psycopg~=3.2.1
psl-dns~=1.1.0
psycopg~=3.2.3
psl-dns~=1.1.1
pylibmc~=1.6.3
pyyaml~=6.0.1
pyyaml~=6.0.2
requests~=2.32.3
uwsgi~=2.0.26
uwsgi~=2.0.28
2 changes: 1 addition & 1 deletion test/e2e2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN git checkout ba9ed5b2898f234cfcefbe5c694b7d89dcec4334 \
&& make \
&& make install

FROM python:3.11-alpine
FROM python:3.12-alpine

RUN apk add --no-cache bash curl

Expand Down
2 changes: 1 addition & 1 deletion test/e2e2/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pytest
pytest-schema
pytest-xdist
requests
dnspython~=2.6.1
dnspython~=2.7.0
2 changes: 1 addition & 1 deletion www/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@fontsource/roboto": "^5.0.3",
"@mdi/js": "~7.4.47",
"axios": "^1.4.0",
"date-fns": "^3.3.1",
"date-fns": "^4.1.0",
"pinia": "^2.0.30",
"vue": "~2.7.14",
"vue-router": "~3.6.5",
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/components/Field/RecordCAA.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const MAX8 = 255;
const int8 = between(0, MAX8);

// https://www.iana.org/assignments/pkix-parameters/pkix-parameters.xhtml#caa-properties
const tags = ['issue', 'issuewild', 'iodef', 'contactemail', 'contactphone'];
const tags = ['issue', 'issuewild', 'iodef', 'contactemail', 'contactphone', 'issuevmc', 'issuemail'];
const tag = (value) => !value || tags.some(v => value == v);

export default {
Expand Down
2 changes: 1 addition & 1 deletion www/webapp/src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const routes = [
component: () => import('@/views/DonatePage.vue'),
},
{
path: 'https://github.com/desec-io/desec-stack/projects?query=is%3Aopen+sort%3Aname-asc&type=classic',
path: 'https://github.com/desec-io/desec-stack/milestones?direction=asc&sort=title&state=open',
name: 'roadmap',
beforeEnter(to) { location.href = to.path },
},
Expand Down