Skip to content

Commit

Permalink
updates for Cumulus v18.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lindsleycj committed Sep 18, 2024
1 parent 0bfd533 commit f434374
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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:

Expand All @@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion cumulus/main.tf
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion data-persistence/main.tf
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit f434374

Please sign in to comment.