From f4343748ac350e2da7eae66ae4c56c5307791427 Mon Sep 17 00:00:00 2001 From: "Lindsley, Chris" Date: Wed, 18 Sep 2024 17:15:39 -0400 Subject: [PATCH] updates for Cumulus v18.4.0 --- CHANGELOG.md | 3 +++ Dockerfile | 8 ++++---- Makefile | 10 +++++----- cumulus/main.tf | 2 +- data-persistence/main.tf | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0013d38..1340e5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ # CHANGELOG ## Unreleased + +## v18.4.0.0 +* Upgrade to [Cumulus v18.4.0](https://github.com/nasa/cumulus/releases/tag/v18.4.0) * Add 'Docker in Docker' functionality by giving the container access to the host's docker engine. This requires running `make docker-in-docker-permissions` diff --git a/Dockerfile b/Dockerfile index 322c3db..894802d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM public.ecr.aws/lambda/python:3.9 as python3 +FROM public.ecr.aws/lambda/python:3.9 AS python3 # This image can be used to do Python 3 & NodeJS development, and # includes the AWS CLI and Terraform. It contains: @@ -11,9 +11,9 @@ FROM public.ecr.aws/lambda/python:3.9 as python3 # * Docker # Amazon Linux 2 does not support node 18.x or node 20.x glibc=2.27 and >=2.28 is required -ENV NODE_VERSION "16.x" -ENV TERRAFORM_VERSION "1.9.2" -ENV AWS_CLI_VERSION "2.17.13" +ENV NODE_VERSION="16.x" +ENV TERRAFORM_VERSION="1.9.2" +ENV AWS_CLI_VERSION="2.17.13" # Add NodeJS and Yarn repos & update package index RUN \ diff --git a/Makefile b/Makefile index 6636f49..6c29f59 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ # PYTHON_VER: python3 # --------------------------- -DOCKER_TAG := v18.3.3.0 +DOCKER_TAG := v18.4.0.0 export TF_IN_AUTOMATION="true" export TF_VAR_MATURITY=${MATURITY} export TF_VAR_DEPLOY_NAME=${DEPLOY_NAME} @@ -74,10 +74,10 @@ container-shell: --env HISTFILE="/CIRRUS-core/.container_bash_history" \ --env TF_VAR_CIRRUS_CORE_VERSION=${CIRRUS_CORE_VERSION} \ --env TF_VAR_CIRRUS_DAAC_VERSION=${CIRRUS_DAAC_VERSION} \ - -v ${PWD}:/CIRRUS-core \ - -v ${DAAC_DIR}:/CIRRUS-DAAC \ - -v ${HOME}/.aws:/.aws \ - -v ${HOME}/.cache/pip:/.cache/pip \ + -v "${PWD}":/CIRRUS-core \ + -v "${DAAC_DIR}":/CIRRUS-DAAC \ + -v "${HOME}/.aws":/.aws \ + -v "${HOME}/.cache/pip":/.cache/pip \ -v /var/run/docker.sock:/var/run/docker.sock \ --name=cirrus-core \ cirrus-core:$(DOCKER_TAG) \ diff --git a/cumulus/main.tf b/cumulus/main.tf index a24b3c6..6948085 100644 --- a/cumulus/main.tf +++ b/cumulus/main.tf @@ -1,5 +1,5 @@ module "cumulus" { - source = "https://github.com/nasa/cumulus/releases/download/v18.3.3/terraform-aws-cumulus.zip//tf-modules/cumulus" + source = "https://github.com/nasa/cumulus/releases/download/v18.4.0/terraform-aws-cumulus.zip//tf-modules/cumulus" cumulus_message_adapter_lambda_layer_version_arn = data.terraform_remote_state.daac.outputs.cma_layer_arn diff --git a/data-persistence/main.tf b/data-persistence/main.tf index deff0fd..79200bb 100644 --- a/data-persistence/main.tf +++ b/data-persistence/main.tf @@ -1,5 +1,5 @@ module "data_persistence" { - source = "https://github.com/nasa/cumulus/releases/download/v18.3.3/terraform-aws-cumulus.zip//tf-modules/data-persistence" + source = "https://github.com/nasa/cumulus/releases/download/v18.4.0/terraform-aws-cumulus.zip//tf-modules/data-persistence" prefix = local.prefix subnet_ids = data.aws_subnets.subnet_ids.ids