Merge branch 'main' of github.com:SlideRuleEarth/sliderule

SlideRuleEarth · Jun 7, 2024 · 9fae470 · 9fae470
2 parents 42079a2 + a1c2898
commit 9fae470
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/clients/nodejs/sliderule/package.json b/clients/nodejs/sliderule/package.json
@@ -2,7 +2,7 @@
   "name": "@sliderule/sliderule",
   "type": "module",
   "description": "client for the SlideRule on-demand science data processing service",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "keywords": [
     "sliderule"
   ],

diff --git a/clients/python/version.txt b/clients/python/version.txt
@@ -1 +1 @@
-v4.5.0
+v4.5.1
diff --git a/plugins/icesat2/endpoints/atl24g.lua b/plugins/icesat2/endpoints/atl24g.lua
@@ -286,4 +286,4 @@ runner.wait(container, timeout)
 arrow.send2user(crenv.host_sandbox_directory.."/atl24.bin", arrow.parms(output_parms), rspq)
 
 -- cleanup container runtime environment
---runner.cleanup(crenv)
+runner.cleanup(crenv)
diff --git a/targets/slideruleearth-aws/docker/sliderule/libdep.lock b/targets/slideruleearth-aws/docker/sliderule/libdep.lock
@@ -1,7 +1,7 @@
 arrow: apache-arrow-15.0.2-0-ge03105efc
-gdal: v3.8.5-0-g1d418c1c1a
-geos: 3.12.1-0-g9a5d0587f
-libgeotiff: 1.7.1-0-gbdeff84
-pistache: 0.0.5-100-g9331499
-PROJ: 9.4.0-0-g7cd00d0b
+gdal: v3.9.0-0-gbb5ea618e2
+geos: 3.12.2-0-gb74fefb7b
+libgeotiff: 1.7.3-0-gd2c72db
+pistache: 0.0.5-109-g65e9b90
+PROJ: 9.4.1-0-g875a485f
 rapidjson: v1.1.0-752-gab1842a2
diff --git a/targets/slideruleearth-aws/terraform/cluster/ilb.tf b/targets/slideruleearth-aws/terraform/cluster/ilb.tf
@@ -21,7 +21,7 @@ resource "aws_instance" "ilb" {
     }
     user_data = <<-EOF
       #!/bin/bash
-      aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 742127912612.dkr.ecr.us-west-2.amazonaws.com
+      aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin ${var.container_repo}
       export OAUTH_HMAC_SECRET='${local.secrets.jwt_secret_key}'
       export IS_PUBLIC=${var.is_public}
       export CLUSTER=${var.cluster_name}

diff --git a/targets/slideruleearth-aws/terraform/cluster/monitor.tf b/targets/slideruleearth-aws/terraform/cluster/monitor.tf
@@ -26,7 +26,7 @@ resource "aws_instance" "monitor" {
       chmod +x ./export_logs.sh
       aws s3 cp s3://sliderule/infrastructure/software/${var.cluster_name}-cronjob.txt ./cronjob.txt
       crontab ./cronjob.txt
-      aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 742127912612.dkr.ecr.us-west-2.amazonaws.com
+      aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin ${var.container_repo}
       export CLIENT_ID='${local.secrets.client_id}'
       export CLIENT_SECRET='${local.secrets.client_secret}'
       export DOMAIN=${var.domain}

diff --git a/targets/slideruleearth-aws/terraform/cluster/sliderule-asg.tf b/targets/slideruleearth-aws/terraform/cluster/sliderule-asg.tf
@@ -42,7 +42,7 @@ resource "aws_launch_configuration" "sliderule-instance" {
   instance_type               = "t4g.2xlarge"
   root_block_device {
     volume_type               = "gp2"
-    volume_size               = 8
+    volume_size               = 16
     delete_on_termination     = true
   }
   key_name                    = var.key_pair_name
@@ -58,8 +58,9 @@ resource "aws_launch_configuration" "sliderule-instance" {
       export SLIDERULE_IMAGE=${var.container_repo}/sliderule:${var.cluster_version}
       export PROVISIONING_SYSTEM="https://ps.${var.domain}"
       export CONTAINER_REGISTRY=${var.container_repo}
-      aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 742127912612.dkr.ecr.us-west-2.amazonaws.com
+      aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin ${var.container_repo}
       aws s3 cp s3://sliderule/infrastructure/software/${var.cluster_name}-docker-compose-sliderule.yml ./docker-compose.yml
+      docker pull ${var.container_repo}/oceaneyes
       docker-compose -p cluster up --detach
   EOF
 }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v4.5.0
+v4.5.1