Skip to content

Commit 836e8f3

Browse files
committed
Remove references to alpha from compose scripts
# Also move the cs-content volume line in the compose-etl script to be # consistent with physics.
1 parent af48010 commit 836e8f3

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

compose

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if [ $# -eq 0 ]
44
then
5-
echo "Usage: compose [alpha|dev|staging|test] VERSION"
5+
echo "Usage: compose [dev|staging|test] VERSION"
66
exit 1
77
fi
88

@@ -11,7 +11,7 @@ APP_VERSION=$2
1111

1212
if [ $2 = "dev" ] || [ $2 = "staging" ] || [ $2 = "test" ] || [ $2 = "live" ]; then
1313
echo "Environment is now first argument to this script. Sorry James."
14-
echo "Usage: compose [alpha|dev|staging|test] VERSION"
14+
echo "Usage: compose [dev|staging|test] VERSION"
1515
exit 1
1616
fi
1717
shift 2
@@ -44,9 +44,7 @@ cs-pg-$ENV:
4444
EOM
4545

4646

47-
if [ "$ENV" == "alpha" ]; then
48-
: # Continue
49-
elif [ "$ENV" == "dev" ]; then
47+
if [ "$ENV" == "dev" ]; then
5048
: # Continue
5149
elif [ "$ENV" == "staging" ]; then
5250
: # Continue
@@ -58,7 +56,7 @@ elif [ "$ENV" == "test" ]; then
5856
TEST_INIT_DATA=" - /local/data/test-cs-db-schema.sql:/docker-entrypoint-initdb.d/test-db-schema.sql"
5957
PG_SERVICE="$PG_SERVICE"$'\n'"$TEST_INIT_DATA"
6058
else
61-
echo "Must set environment to alpha, dev, staging or test"
59+
echo "Must set environment to dev, staging or test"
6260
exit 1
6361
fi
6462

compose-etl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fi
99

1010

1111
APP_VERSION=$1
12-
ENV=alpha # Yes, we'll want to change this later
12+
ENV=live
1313

1414
# We're done with the first argument. The remainder will be passed to docker-compose
1515
shift 1
@@ -36,8 +36,8 @@ services:
3636
volumes:
3737
- /local/data/m2:/root/.m2:rw
3838
- /local/data/isaac-config/cs/segue-config.$ENV.properties:/local/data/conf/segue-config.properties:ro
39-
- /local/data/cs-content:/local/data/cs-content:rw
4039
- /local/data/isaac-config/cs/content_indices.properties:/local/data/conf/content_indices.properties:rw
40+
- /local/data/cs-content:/local/data/cs-content:rw
4141
- /local/data/keys:/local/data/keys:ro
4242
- /local/data/school_list_2019.csv:/local/data/school_list_2019.csv:ro
4343
- /var/log/isaac/cs-etl:/isaac-logs:rw

0 commit comments

Comments
 (0)