Skip to content

Commit

Permalink
fix: post rebase main merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ymijsters committed Dec 17, 2024
2 parents 24007d5 + 671972b commit 74ce71e
Show file tree
Hide file tree
Showing 83 changed files with 5,233 additions and 2,361 deletions.
73 changes: 28 additions & 45 deletions .aws/graasp-prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"cpu": "2048",
"memory": "4096",
"requiresCompatibilities": ["FARGATE"],
"requiresCompatibilities": ["FARGATE"],
"networkMode": "awsvpc",
"runtimePlatform": {
"operatingSystemFamily": "LINUX",
Expand Down Expand Up @@ -41,43 +42,25 @@
"systemControls": null,
"privileged": null,
"name": "graasp"
"essential": true,
"links": null,
"hostname": null,
"extraHosts": null,
"pseudoTerminal": null,
"user": null,
"readonlyRootFilesystem": null,
"dockerLabels": null,
"systemControls": null,
"privileged": null,
"name": "graasp"
},
{
"dnsSearchDomains": null,
"environmentFiles": null,
"dnsSearchDomains": null,
"environmentFiles": null,
"logConfiguration": {
"logDriver": "awslogs",
"secretOptions": null,
"secretOptions": null,
"options": {
"awslogs-group": "/ecs/graasp-iframely-production",
"awslogs-group": "/ecs/graasp-iframely-production",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"entryPoint": null,
"entryPoint": null,
"portMappings": [
{
"hostPort": 8061,
"hostPort": 8061,
"protocol": "tcp",
"containerPort": 8061
"containerPort": 8061
}
],
"command": null,
Expand Down Expand Up @@ -107,33 +90,6 @@
"disableNetworking": null,
"interactive": null,
"healthCheck": null,
"command": null,
"linuxParameters": null,
"cpu": 0,
"environment": [
{
"name": "NODE_ENV",
"value": "production"
}
],
"resourceRequirements": null,
"ulimits": null,
"dnsServers": null,
"mountPoints": [],
"workingDirectory": null,
"secrets": null,
"dockerSecurityOptions": null,
"memory": null,
"memoryReservation": null,
"volumesFrom": [],
"stopTimeout": null,
"image": "graasp/iframely",
"startTimeout": null,
"firelensConfiguration": null,
"dependsOn": null,
"disableNetworking": null,
"interactive": null,
"healthCheck": null,
"essential": true,
"links": null,
"hostname": null,
Expand All @@ -145,6 +101,16 @@
"systemControls": null,
"privileged": null,
"name": "graasp-iframely-production"
"links": null,
"hostname": null,
"extraHosts": null,
"pseudoTerminal": null,
"user": null,
"readonlyRootFilesystem": null,
"dockerLabels": null,
"systemControls": null,
"privileged": null,
"name": "graasp-iframely-production"
}
],
"placementConstraints": [],
Expand All @@ -164,4 +130,21 @@
"inferenceAccelerators": null,
"proxyConfiguration": null,
"volumes": []
"placementConstraints": [],
"memory": "4096",
"taskRoleArn": null,
"compatibilities": [],
"taskDefinitionArn": null,
"family": "graasp",
"requiresAttributes": [],
"pidMode": null,
"requiresCompatibilities": ["FARGATE"],
"networkMode": "awsvpc",
"runtimePlatform": null,
"cpu": "2048",
"revision": null,
"status": null,
"inferenceAccelerators": null,
"proxyConfiguration": null,
"volumes": []
}
145 changes: 78 additions & 67 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,67 +1,78 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": [
"javascript",
"typescript"
],
"editor.formatOnSave": true,
"[javascript]": {
"editor.formatOnSave": true
},
"[typescript]": {
"editor.formatOnSave": true
},
"[markdown]": {
"editor.formatOnSave": true
},
"search.exclude": {
"**/node_modules": true,
"**/bower_components": true,
"**/dist": true,
"**/coverage": true
},
"typescript.referencesCodeLens.enabled": false,
"appService.zipIgnorePattern": [
".vscode{,/**}"
],
"appService.deploySubpath": "",
"jest.runMode": "on-demand",
"sqltools.connections": [
{
"previewLimit": 50,
"server": "db",
"port": 5432,
"driver": "PostgreSQL",
"name": "Umami",
"group": "graasp",
"database": "umami",
"username": "umami",
"password": "umami"
},
{
"previewLimit": 50,
"server": "db",
"port": 5432,
"name": "backend",
"driver": "PostgreSQL",
"database": "docker",
"username": "docker",
"password": "docker",
"group": "graasp"
},
{
"previewLimit": 50,
"server": "db",
"port": 5432,
"driver": "PostgreSQL",
"name": "etherpad",
"group": "graasp",
"database": "etherpad",
"username": "etherpad",
"password": "etherpad"
}
],
}
// Place your settings in this file to overwrite default and user settings.
{
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": [
"javascript",
"typescript"
],
"editor.formatOnSave": true,
"[javascript]": {
"editor.formatOnSave": true
},
"[typescript]": {
"editor.formatOnSave": true
},
"[markdown]": {
"editor.formatOnSave": true
},
"search.exclude": {
"**/node_modules": true,
"**/bower_components": true,
"**/dist": true,
"**/coverage": true
},
"typescript.referencesCodeLens.enabled": false,
"appService.zipIgnorePattern": [
".vscode{,/**}"
],
"appService.deploySubpath": "",
"jest.runMode": "on-demand",
"sqltools.connections": [
{
"previewLimit": 50,
"server": "db",
"port": 5432,
"driver": "PostgreSQL",
"name": "Umami",
"group": "graasp",
"database": "umami",
"username": "umami",
"password": "umami"
},
{
"previewLimit": 50,
"server": "db",
"port": 5432,
"name": "backend",
"driver": "PostgreSQL",
"database": "docker",
"username": "docker",
"password": "docker",
"group": "graasp"
},
{
"previewLimit": 50,
"server": "db",
"port": 5432,
"driver": "PostgreSQL",
"name": "etherpad",
"group": "graasp",
"database": "etherpad",
"username": "etherpad",
"password": "etherpad"
},
{
"previewLimit": 50,
"server": "db",
"port": 5432,
"driver": "PostgreSQL",
"name": "test-db",
"group": "graasp",
"database": "test",
"username": "test",
"password": "test"
}
],
}
925 changes: 0 additions & 925 deletions .yarn/releases/yarn-4.5.0.cjs

This file was deleted.

934 changes: 934 additions & 0 deletions .yarn/releases/yarn-4.5.3.cjs

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
checksumBehavior: update

compressionLevel: mixed

defaultSemverRangePrefix: ''

enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.0.cjs
checksumBehavior: update

compressionLevel: mixed

defaultSemverRangePrefix: ''

enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.3.cjs
Loading

0 comments on commit 74ce71e

Please sign in to comment.