From 917d022d7f71ceb302d4e87f319677113e41af54 Mon Sep 17 00:00:00 2001 From: bwmac Date: Thu, 20 Jun 2024 16:07:16 -0600 Subject: [PATCH] fix redis config --- config/infra-dev/nextflow-ecs-task-definition.yaml | 1 + config/infra-prod/nextflow-ecs-task-definition.yaml | 1 + templates/nextflow-ecs-task-definition.j2 | 2 ++ 3 files changed, 4 insertions(+) diff --git a/config/infra-dev/nextflow-ecs-task-definition.yaml b/config/infra-dev/nextflow-ecs-task-definition.yaml index fc236df..ac404e4 100644 --- a/config/infra-dev/nextflow-ecs-task-definition.yaml +++ b/config/infra-dev/nextflow-ecs-task-definition.yaml @@ -26,6 +26,7 @@ parameters: FrontendContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/frontend:{{stack_group_config.tower_version}}' BackendContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}' MigrateDBContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/migrate-db:{{stack_group_config.tower_version}}' + RedisContainerImage: 'cr.seqera.io/public/redis:5.0.8' EfsFileSystemId: !stack_output_external nextflow-efs-file-system::FileSystemId EfsVolumeMountPath: '/efs' TowerUserWorkspace: 'false' diff --git a/config/infra-prod/nextflow-ecs-task-definition.yaml b/config/infra-prod/nextflow-ecs-task-definition.yaml index 497feff..c7f5251 100644 --- a/config/infra-prod/nextflow-ecs-task-definition.yaml +++ b/config/infra-prod/nextflow-ecs-task-definition.yaml @@ -26,6 +26,7 @@ parameters: FrontendContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/frontend:{{stack_group_config.tower_version}}' BackendContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/backend:{{stack_group_config.tower_version}}' MigrateDBContainerImage: 'cr.seqera.io/private/nf-tower-enterprise/migrate-db:{{stack_group_config.tower_version}}' + RedisContainerImage: 'cr.seqera.io/public/redis:5.0.8' EfsFileSystemId: !stack_output_external nextflow-efs-file-system::FileSystemId EfsVolumeMountPath: '/efs' TowerUserWorkspace: 'false' diff --git a/templates/nextflow-ecs-task-definition.j2 b/templates/nextflow-ecs-task-definition.j2 index 8b82b99..8da9e6b 100644 --- a/templates/nextflow-ecs-task-definition.j2 +++ b/templates/nextflow-ecs-task-definition.j2 @@ -189,9 +189,11 @@ Resources: EFSVolumeConfiguration: FilesystemId: !Ref EfsFileSystemId ContainerDefinitions: + {%- if sceptre_user_data.EnableRedisDocker is defined and sceptre_user_data.EnableRedisDocker %} - image: !Ref RedisContainerImage repositoryCredentials: credentialsParameter: !Sub 'arn:aws:secretsmanager:us-east-1:${AWS::AccountId}:secret:TOWER_DEV_SEQERA_REGISTRY_SECRET' + {%- endif %} - image: !Ref MigrateDBContainerImage repositoryCredentials: credentialsParameter: !Sub 'arn:aws:secretsmanager:us-east-1:${AWS::AccountId}:secret:TOWER_DEV_SEQERA_REGISTRY_SECRET'