Skip to content

feat: Update to the container image #76

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.

Sign up for GitHub

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

feat: Update to the container image #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73d4c2a
feat: Update to the container image
Aug 29, 2023
1834174
terraform-docs: automated action
github-actions[bot] Aug 29, 2023
aca7783
feat: Updating container to pandoc
Sep 1, 2023
2336d89
Merge branch 'dg-pandoc-container' of https://github.com/UCL-ARC/terr…
Sep 1, 2023
811fd12
terraform-docs: automated action
github-actions[bot] Sep 1, 2023
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ No resources.
| <a name="input_as2_stack_name"></a> [as2\_stack\_name](#input\_as2\_stack\_name) | Stack name | `string` | `"ARC-batch-stack"` | no |
| <a name="input_compute_environments"></a> [compute\_environments](#input\_compute\_environments) | Compute environments | `string` | `"fargate"` | no |
| <a name="input_compute_resources_max_vcpus"></a> [compute\_resources\_max\_vcpus](#input\_compute\_resources\_max\_vcpus) | Max VCPUs resources | `number` | `1` | no |
| <a name="input_container_image_url"></a> [container\_image\_url](#input\_container\_image\_url) | Container image URL | `string` | `"public.ecr.aws/docker/library/busybox:latest"` | no |
| <a name="input_container_image_url"></a> [container\_image\_url](#input\_container\_image\_url) | Container image URL | `string` | `"pandoc/minimal"` | no |
| <a name="input_container_memory"></a> [container\_memory](#input\_container\_memory) | Containter Memory resources | `number` | `2048` | no |
| <a name="input_container_vcpu"></a> [container\_vcpu](#input\_container\_vcpu) | Containter VCPUs resources | `number` | `1` | no |
| <a name="input_efs_throughput_in_mibps"></a> [efs\_throughput\_in\_mibps](#input\_efs\_throughput\_in\_mibps) | EFS provisioned throughput in mibps | `number` | `1` | no |
Expand Down
37 changes: 1 addition & 36 deletions modules/batch/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,41 +44,6 @@ module "batch" {
}
}

# # Job queues and scheduling policies
# job_queues = {
# low_priority = {
# name = "LowPriority"
# state = "ENABLED"
# priority = 1

# tags = {
# JobQueue = "Low priority job queue"
# }
# }

# high_priority = {
# name = "HighPriority"
# state = "ENABLED"
# priority = 99

# fair_share_policy = {
# compute_reservation = 1
# share_decay_seconds = 3600

# share_distribution = [{
# share_identifier = "A1*"
# weight_factor = 0.1
# }, {
# share_identifier = "A2"
# weight_factor = 0.2
# }]
# }

# tags = {
# JobQueue = "High priority job queue"
# }
# }
# }
}

resource "aws_batch_job_definition" "simple_batch_job" {
Expand All @@ -90,7 +55,7 @@ resource "aws_batch_job_definition" "simple_batch_job" {
container_properties = <<CONTAINER_PROPERTIES
{
"image": "${var.container_image_url}",
"command": ["df", "-h"],
"command": ["/mnt/example.txt", "-o", "example.pdf"],
"executionRoleArn": "${aws_iam_role.ecs_task_execution_role.arn}",
"volumes": [
{
Expand Down
2 changes: 1 addition & 1 deletion modules/datasync/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ resource "aws_datasync_task" "datasync_task_efs_s3" {

resource "aws_datasync_location_s3" "s3_upload" {
s3_bucket_arn = var.upload_s3_arn
subdirectory = "/chronostics/"
subdirectory = "/"

s3_config {
bucket_access_role_arn = aws_iam_role.role_for_datasync_s3_uploads.arn
Expand Down
4 changes: 2 additions & 2 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ variable "compute_environments" {
variable "compute_resources_max_vcpus" {
type = number
description = "Max VCPUs resources"
default = 1
default = 1.0
}
variable "container_image_url" {
type = string
description = "Container image URL"
default = "public.ecr.aws/docker/library/busybox:latest"
default = "pandoc/minimal"
}
variable "container_vcpu" {
type = number
Expand Down