Skip to content

Commit 92b9b41

Browse files
rishyym0927rishyym0927
authored
Merge branch 'main' into contricard
2 parents 9036935 + f6077ba commit 92b9b41

File tree

13 files changed

+603
-578
lines changed

13 files changed

+603
-578
lines changed

‎.github/ansible/production/nest.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,16 @@
9999
dest: ~/
100100
mode: '0400'
101101

102+
- name: Copy crontab
103+
copy:
104+
src: '{{ github_workspace }}/cron/production'
105+
dest: /tmp/production_crontab
106+
mode: '0600'
107+
108+
- name: Install crontab
109+
ansible.builtin.command:
110+
cmd: crontab /tmp/production_crontab
111+
102112
- name: Retart services
103113
shell:
104114
cmd: docker compose up -d --pull always

‎.github/ansible/staging/nest.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,16 @@
111111
dest: ~/
112112
mode: '0400'
113113

114+
- name: Copy crontab
115+
copy:
116+
src: '{{ github_workspace }}/cron/staging'
117+
dest: /tmp/staging_crontab
118+
mode: '0600'
119+
120+
- name: Install crontab
121+
ansible.builtin.command:
122+
cmd: crontab /tmp/staging_crontab
123+
114124
- name: Retart services
115125
shell:
116126
cmd: docker compose up -d --pull always

‎.github/workflows/run-ci-cd.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ jobs:
400400
echo "DJANGO_SETTINGS_MODULE=${{ secrets.DJANGO_SETTINGS_MODULE }}" >> .env.backend
401401
echo "DJANGO_SLACK_BOT_TOKEN=${{ secrets.DJANGO_SLACK_BOT_TOKEN }}" >> .env.backend
402402
echo "DJANGO_SLACK_SIGNING_SECRET=${{ secrets.DJANGO_SLACK_SIGNING_SECRET }}" >> .env.backend
403-
echo "GITHUB_TOKEN=${{ secrets.DJANGO_GITHUB_TOKEN }}" >> .env.backend
403+
echo "GITHUB_TOKEN=${{ secrets.NEST_GITHUB_TOKEN }}" >> .env.backend
404404
echo "SLACK_BOT_TOKEN_T04T40NHX=${{ secrets.SLACK_BOT_TOKEN_T04T40NHX }}" >> .env.backend
405405
406406
# Cache
@@ -591,7 +591,7 @@ jobs:
591591
echo "DJANGO_SETTINGS_MODULE=${{ secrets.DJANGO_SETTINGS_MODULE }}" >> .env.backend
592592
echo "DJANGO_SLACK_BOT_TOKEN=${{ secrets.DJANGO_SLACK_BOT_TOKEN }}" >> .env.backend
593593
echo "DJANGO_SLACK_SIGNING_SECRET=${{ secrets.DJANGO_SLACK_SIGNING_SECRET }}" >> .env.backend
594-
echo "GITHUB_TOKEN=${{ secrets.DJANGO_GITHUB_TOKEN }}" >> .env.backend
594+
echo "GITHUB_TOKEN=${{ secrets.NEST_GITHUB_TOKEN }}" >> .env.backend
595595
echo "SLACK_BOT_TOKEN_T04T40NHX=${{ secrets.SLACK_BOT_TOKEN_T04T40NHX }}" >> .env.backend
596596
597597
# Cache

‎backend/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.13.4-alpine AS builder
1+
FROM python:3.13.5-alpine AS builder
22

33
ENV APK_CACHE_DIR="/home/owasp/.cache/apk" \
44
APK_SYMLINK_DIR="/etc/apk/cache" \
@@ -36,7 +36,7 @@ COPY settings settings
3636
COPY static static
3737
COPY templates templates
3838

39-
FROM python:3.13.4-alpine
39+
FROM python:3.13.5-alpine
4040

4141
RUN apk update && \
4242
addgroup -S owasp && \

‎backend/docker/Dockerfile.local

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.13.4-alpine AS builder
1+
FROM python:3.13.5-alpine AS builder
22

33
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
44

@@ -30,7 +30,7 @@ COPY --chmod=444 --chown=owasp:owasp poetry.lock pyproject.toml ./
3030
RUN --mount=type=cache,target=${POETRY_CACHE_DIR},uid=${OWASP_UID},gid=${OWASP_GID} \
3131
poetry install --no-root --without dev --without test
3232

33-
FROM python:3.13.4-alpine
33+
FROM python:3.13.5-alpine
3434

3535
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
3636

‎backend/docker/Dockerfile.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.13.4-alpine AS builder
1+
FROM python:3.13.5-alpine AS builder
22

33
ENV APK_CACHE_DIR="/home/owasp/.cache/apk-backend-test" \
44
APK_SYMLINK_DIR="/etc/apk/cache" \
@@ -36,7 +36,7 @@ COPY static static
3636
COPY templates templates
3737
COPY tests tests
3838

39-
FROM python:3.13.4-alpine
39+
FROM python:3.13.5-alpine
4040

4141
RUN addgroup -S owasp && \
4242
adduser -S -h /home/owasp -G owasp owasp && \

‎backend/poetry.lock

Lines changed: 79 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cron/production

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# OWASP Nest production cron job schedule.
2+
3+
# Daily GitHub sync.
4+
17 5 * * * cd /home/production; make sync-data > /var/log/nest/production/sync-data.log 2>&1

‎cron/staging

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# OWASP Nest staging cron job schedule.

‎docs/docker/Dockerfile.local

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.13.4-alpine AS builder
1+
FROM python:3.13.5-alpine AS builder
22

33
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
44

@@ -31,7 +31,7 @@ RUN --mount=type=cache,target=${POETRY_CACHE_DIR},uid=${OWASP_UID},gid=${OWASP_G
3131
poetry install --no-root && \
3232
rm -rf docs/poetry.lock docs/pyproject.toml
3333

34-
FROM python:3.13.4-alpine
34+
FROM python:3.13.5-alpine
3535

3636
SHELL ["/bin/sh", "-o", "pipefail", "-c"]
3737

‎frontend/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@heroui/tooltip": "^2.2.18",
3333
"@next/eslint-plugin-next": "^15.3.3",
3434
"@next/third-parties": "^15.3.3",
35-
"@sentry/nextjs": "^9.28.1",
35+
"@sentry/nextjs": "^9.29.0",
3636
"@testing-library/user-event": "^14.6.1",
3737
"@types/leaflet.markercluster": "^1.5.5",
3838
"@types/lodash": "^4.17.17",
@@ -44,7 +44,7 @@
4444
"dompurify": "^3.2.6",
4545
"dotenv": "^16.5.0",
4646
"eslint-plugin-import": "^2.31.0",
47-
"framer-motion": "^12.17.3",
47+
"framer-motion": "^12.18.1",
4848
"graphql": "^16.11.0",
4949
"leaflet": "^1.9.4",
5050
"leaflet.markercluster": "^1.5.3",
@@ -65,7 +65,7 @@
6565
"@eslint/eslintrc": "^3.3.1",
6666
"@eslint/js": "^9.28.0",
6767
"@playwright/test": "^1.53.0",
68-
"@swc/core": "^1.12.0",
68+
"@swc/core": "^1.12.1",
6969
"@swc/jest": "^0.2.38",
7070
"@tailwindcss/postcss": "^4.1.10",
7171
"@testing-library/jest-dom": "^6.6.3",
@@ -85,14 +85,14 @@
8585
"eslint-config-next": "^15.3.3",
8686
"eslint-config-prettier": "^10.1.5",
8787
"eslint-import-resolver-alias": "^1.1.2",
88-
"eslint-plugin-jest": "^28.13.3",
88+
"eslint-plugin-jest": "^28.13.5",
8989
"eslint-plugin-jsx-a11y": "^6.10.2",
9090
"eslint-plugin-prettier": "^5.4.1",
9191
"eslint-plugin-react": "^7.37.5",
9292
"eslint-plugin-react-hooks": "^5.2.0",
9393
"globals": "^16.2.0",
9494
"identity-obj-proxy": "^3.0.0",
95-
"import-in-the-middle": "^1.14.0",
95+
"import-in-the-middle": "^1.14.1",
9696
"jest": "^29.7.0",
9797
"jest-axe": "^10.0.0",
9898
"jest-environment-jsdom": "^30.0.0",

0 commit comments

Comments
 (0)