Skip to content

Commit

Permalink
Merge branch 'devel' into l10n_devel
Browse files Browse the repository at this point in the history
  • Loading branch information
manuelmeister authored Nov 19, 2024
2 parents dd133f5 + 96eec94 commit 66f77c1
Show file tree
Hide file tree
Showing 27 changed files with 2,374 additions and 2,266 deletions.
2 changes: 1 addition & 1 deletion .helm/ecamp3/files/db-backup-restore-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:12.7-slim
FROM debian:12.8-slim

ENV DEBIAN_FRONTEND="noninteractive"
RUN apt-get update && \
Expand Down
4 changes: 2 additions & 2 deletions .ops/aws-setup/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
aws-setup:
image: pulumi/pulumi-nodejs:3.137.0
image: pulumi/pulumi-nodejs:3.138.0
container_name: 'ecamp3-aws-setup'
volumes:
- ../../.prettierrc:/.prettierrc:delegated
Expand All @@ -13,7 +13,7 @@ services:
- AWS_DEFAULT_REGION=eu-west-3

aws-cli:
image: amazon/aws-cli:2.19.1
image: amazon/aws-cli:2.22.0
container_name: 'ecamp3-aws-cli'
volumes:
- ./.aws:/root/.aws:delegated
Expand Down
1,175 changes: 380 additions & 795 deletions .ops/aws-setup/package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions .ops/aws-setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@
"lint:check:prettier": "prettier --check --ignore-path .prettierignore **/*.{json,md,mjs,ts}"
},
"dependencies": {
"@pulumi/pulumi": "3.137.0",
"@pulumi/aws": "6.57.0",
"@pulumi/awsx": "2.16.1"
"@pulumi/pulumi": "3.139.0",
"@pulumi/aws": "6.59.1",
"@pulumi/awsx": "2.19.0"
},
"devDependencies": {
"@babel/eslint-parser": "7.25.9",
"@eslint/compat": "1.2.2",
"@eslint/compat": "1.2.3",
"@eslint/eslintrc": "3.1.0",
"@eslint/js": "9.14.0",
"@eslint/js": "9.15.0",
"@types/node": "22.9.0",
"eslint": "9.14.0",
"eslint": "9.15.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-n": "17.12.0",
"eslint-plugin-n": "17.13.2",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-promise": "7.1.0",
"globals": "15.11.0",
"globals": "15.12.0",
"prettier": "3.3.3"
}
}
10 changes: 5 additions & 5 deletions .ops/ops-dashboard/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
dependencies:
- name: oauth2-proxy
repository: https://oauth2-proxy.github.io/manifests
version: 7.7.28
version: 7.7.29
- name: kubernetes-dashboard
repository: https://kubernetes.github.io/dashboard/
version: 7.10.0
- name: oauth2-proxy
repository: https://oauth2-proxy.github.io/manifests
version: 7.7.28
version: 7.7.29
- name: oauth2-proxy
repository: https://oauth2-proxy.github.io/manifests
version: 7.7.28
digest: sha256:e9794cbd50f07779fd3d23196b9189a2d4ff9226e85f344dc0b1fbf559568f54
generated: "2024-10-31T16:01:38.780035684Z"
version: 7.7.29
digest: sha256:81c74aad974844e6865c3880c941d87bbe225457b34593213eb34dd836a6aaa9
generated: "2024-11-12T18:19:05.804340122Z"
6 changes: 3 additions & 3 deletions .ops/ops-dashboard/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ appVersion: 0.1.0
dependencies:
- name: oauth2-proxy
alias: grafana-proxy
version: 7.7.28
version: 7.7.29
repository: https://oauth2-proxy.github.io/manifests
- name: kubernetes-dashboard
version: 7.10.0
repository: https://kubernetes.github.io/dashboard/
- name: oauth2-proxy
alias: kubernetes-dashboard-proxy
version: 7.7.28
version: 7.7.29
repository: https://oauth2-proxy.github.io/manifests
- name: oauth2-proxy
alias: logging-proxy
version: 7.7.28
version: 7.7.29
repository: https://oauth2-proxy.github.io/manifests
18 changes: 9 additions & 9 deletions api/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"doctrine/orm": "2.20.0",
"exercise/htmlpurifier-bundle": "5.0",
"friendsofsymfony/http-cache": "3.1.0",
"friendsofsymfony/http-cache-bundle": "3.0.1",
"friendsofsymfony/http-cache-bundle": "3.0.2",
"google/recaptcha": "1.3.0",
"guzzlehttp/guzzle": "7.9.2",
"knpuniversity/oauth2-client-bundle": "2.18.3",
"league/oauth2-google": "4.0.1",
"lexik/jwt-authentication-bundle": "3.1.0",
"nelmio/cors-bundle": "2.5.0",
"phpdocumentor/reflection-docblock": "5.5.0",
"phpmyadmin/sql-parser": "5.10.0",
"phpdocumentor/reflection-docblock": "5.5.1",
"phpmyadmin/sql-parser": "5.10.1",
"ramsey/uuid": "4.7.6",
"rize/uri-template": "0.3.8",
"sentry/sentry-symfony": "5.0.1",
Expand All @@ -33,22 +33,22 @@
"symfony/expression-language": "7.1.6",
"symfony/flex": "2.4.7",
"symfony/framework-bundle": "7.1.5",
"symfony/http-client": "7.1.6",
"symfony/http-client": "7.1.8",
"symfony/intl": "7.1.6",
"symfony/mailer": "7.1.6",
"symfony/monolog-bundle": "3.10.0",
"symfony/property-access": "7.1.6",
"symfony/property-info": "7.1.6",
"symfony/runtime": "7.1.6",
"symfony/runtime": "7.1.7",
"symfony/security-bundle": "7.1.6",
"symfony/serializer": "7.1.6",
"symfony/translation": "7.1.6",
"symfony/twig-bundle": "7.1.6",
"symfony/validator": "7.1.6",
"symfony/yaml": "7.1.6",
"twig/cssinliner-extra": "^3.4",
"twig/extra-bundle": "3.13.0",
"webonyx/graphql-php": "15.18.0"
"twig/extra-bundle": "3.15.0",
"webonyx/graphql-php": "15.18.1"
},
"require-dev": {
"brianium/paratest": "7.4.5",
Expand All @@ -57,9 +57,9 @@
"justinrainbow/json-schema": "6.0.0",
"php-coveralls/php-coveralls": "2.7.0",
"phpspec/prophecy-phpunit": "2.2",
"phpstan/phpstan": "1.12.7",
"phpstan/phpstan": "1.12.11",
"phpunit/phpunit": "10.5.31",
"rector/rector": "1.2.9",
"rector/rector": "1.2.10",
"psalm/phar": "5.26.1",
"spatie/phpunit-snapshot-assertions": "5.1.6",
"symfony/browser-kit": "7.1.6",
Expand Down
Loading

0 comments on commit 66f77c1

Please sign in to comment.