Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 compose
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fi
API_NAME=$SITE-api-$ENV-$API_VERSION
APP_NAME=$SITE-app-$ENV-$APP_VERSION
PG_CONTAINER_NAME=$SITE-pg-$ENV
ES_CONTAINER_NAME=$SUBJECT-elasticsearch-live
ES_CONTAINER_NAME=$SITE-elasticsearch-v8-live

# The content repo is named differently for both sites in a non-standard way:
if [ "$SUBJECT" == "ada" ]; then
Expand Down
7 changes: 3 additions & 4 deletions compose-etl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if [ -z $API_VERSION ]; then
fi

ETL_NAME=$SITE-etl-$API_VERSION
ES_CONTAINER=$SUBJECT-elasticsearch-live
ES_CONTAINER=$SITE-elasticsearch-v8-live

# The content repo is named differently for both sites in a non-standard way:
if [ "$SITE" == "ada" ]; then
Expand All @@ -59,7 +59,6 @@ elif [ "$SITE" == "phy" ]; then
fi

docker compose -p dc-$SITE-etl -f - $@ << EOF
version: '2'
services:
$SITE-etl:
container_name: $ETL_NAME
Expand All @@ -86,8 +85,8 @@ services:
tag: $SITE-isaac-etl
networks:
default:
external:
name: isaac
name: isaac
external: true
EOF

exit 0
Expand Down
7 changes: 3 additions & 4 deletions compose-live
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fi
API_NAME=$SITE-api-$ENV-$API_VERSION
APP_NAME=$SITE-app-$ENV-$APP_VERSION
PG_CONTAINER=$SUBJECT-pg-$ENV
ES_CONTAINER=$SUBJECT-elasticsearch-live
ES_CONTAINER=$SITE-elasticsearch-v8-live

# The content repo is named differently for both sites in a non-standard way:
if [ "$SUBJECT" == "ada" ]; then
Expand All @@ -61,7 +61,6 @@ elif [ "$SUBJECT" == "phy" ]; then
fi

docker compose -p dc-${APP_NAME//./-} -f - $@ << EOF
version: '2'
services:
$APP_NAME:
container_name: $APP_NAME
Expand Down Expand Up @@ -103,8 +102,8 @@ services:
restart: unless-stopped
networks:
default:
external:
name: isaac
name: isaac
external: true
EOF

exit 0
Loading