Skip to content

Commit

Permalink
fix: squash commits to remove H5P/eth, incorporate Graasp updates and…
Browse files Browse the repository at this point in the history 
… update AWS task
  • Loading branch information
@ymijsters
ymijsters committed Dec 17, 2024
1 parent e070c1b commit 8f3f0de
Show file tree
Hide file tree
Showing 21 changed files with 2,849 additions and 2,997 deletions.
156 changes: 117 additions & 39 deletions .aws/graasp-dev.json
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,117 @@
{
"ipcMode": null,
"executionRoleArn": "arn:aws:iam::087219672371:role/ecsTaskExecutionRole",
"family": "graasp",
"cpu": "1024",
"memory": "3072",
"requiresCompatibilities": ["FARGATE"],
"networkMode": "awsvpc",
"runtimePlatform": {
"operatingSystemFamily": "LINUX",
"cpuArchitecture": null
},
"containerDefinitions": [
{
"name": "graasp",
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/graasp",
"awslogs-region": "eu-central-1",
"awslogs-stream-prefix": "ecs"
}
},
"portMappings": [
{
"hostPort": 3111,
"protocol": "tcp",
"containerPort": 3111
}
],
"image": null,
"dependsOn": null,
"disableNetworking": null,
"healthCheck": null,
"essential": true
}
],
"placementConstraints": []
}
{
"ipcMode": null,
"executionRoleArn": "arn:aws:iam::087219672371:role/ecsTaskExecutionRole",
"containerDefinitions": [
{
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/lnco-ai-development",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"portMappings": [
{
"hostPort": 3111,
"protocol": "tcp",
"containerPort": 3111
}
],
"image": null,
"dependsOn": null,
"disableNetworking": null,
"healthCheck": null,
"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,
"logConfiguration": {
"logDriver": "awslogs",
"secretOptions": null,
"options": {
"awslogs-group": "/ecs/lnco-ai-iframely-development",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"entryPoint": null,
"portMappings": [
{
"hostPort": 8061,
"protocol": "tcp",
"containerPort": 8061
}
],
"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,
"extraHosts": null,
"pseudoTerminal": null,
"user": null,
"readonlyRootFilesystem": null,
"dockerLabels": null,
"systemControls": null,
"privileged": null,
"name": "graasp-iframely-development"
}
],
"placementConstraints": [],
"memory": "3072",
"taskRoleArn": null,
"compatibilities": [],
"taskDefinitionArn": null,
"family": "graasp",
"requiresAttributes": [],
"pidMode": null,
"requiresCompatibilities": ["FARGATE"],
"networkMode": "awsvpc",
"runtimePlatform": {
"operatingSystemFamily": "LINUX",
"cpuArchitecture": null
},
"cpu": "1024",
"revision": null,
"status": null,
"inferenceAccelerators": null,
"proxyConfiguration": null,
"volumes": []
}
188 changes: 150 additions & 38 deletions .aws/graasp-prod.json
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,150 @@
{
"executionRoleArn": "arn:aws:iam::592217263685:role/graasp-prod-ecs-execution-role",
"family": "graasp",
"cpu": "2048",
"memory": "4096",
"requiresCompatibilities": ["FARGATE"],
"networkMode": "awsvpc",
"runtimePlatform": {
"operatingSystemFamily": "LINUX",
"cpuArchitecture": null
},
"containerDefinitions": [
{
"name": "graasp",
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/graasp",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"portMappings": [
{
"hostPort": 3111,
"protocol": "tcp",
"containerPort": 3111
}
],
"image": null,
"dependsOn": null,
"disableNetworking": null,
"healthCheck": null,
"essential": true
}
],
"placementConstraints": []
}
{
"executionRoleArn": "arn:aws:iam::592217263685:role/graasp-prod-ecs-execution-role",
"family": "graasp",
"cpu": "2048",
"memory": "4096",
"requiresCompatibilities": ["FARGATE"],
"requiresCompatibilities": ["FARGATE"],
"networkMode": "awsvpc",
"runtimePlatform": {
"operatingSystemFamily": "LINUX",
"cpuArchitecture": null
},
"containerDefinitions": [
{
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/graasp",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"portMappings": [
{
"hostPort": 3111,
"protocol": "tcp",
"containerPort": 3111
}
],
"image": null,
"dependsOn": null,
"disableNetworking": null,
"healthCheck": null,
"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,
"logConfiguration": {
"logDriver": "awslogs",
"secretOptions": null,
"options": {
"awslogs-group": "/ecs/graasp-iframely-production",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"entryPoint": null,
"portMappings": [
{
"hostPort": 8061,
"protocol": "tcp",
"containerPort": 8061
}
],
"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,
"extraHosts": null,
"pseudoTerminal": null,
"user": null,
"readonlyRootFilesystem": null,
"dockerLabels": null,
"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": [],
"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": []
"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": []
}
8 changes: 0 additions & 8 deletions .devcontainer/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,6 @@ services:
# ports:
# - 8061:8061

# necessary for validation
nudenet:
container_name: graasp-nudenet
image: notaitech/nudenet:classifier
# exposing these ports is not necessary
# ports:
# - 8080:8080

# a mock mailbox on port 1025 (web UI at http://localhost:1080)
mailer:
container_name: mailer
Expand Down
2 changes: 1 addition & 1 deletion .husky/commit-msg
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

#npx --no-install commitlint --edit "$1"
npx --no-install commitlint --edit "$1"
Loading

0 comments on commit 8f3f0de

Please sign in to comment.