Skip to content

Commit 15f1c61

Browse files
committed
build.sh: setup hackage distro token file
[skip ci]
1 parent 6bb1304 commit 15f1c61

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

automated/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ cat >$GITCONFIG <<EOF
5959
name = Stackage Build host
6060
EOF
6161

62-
HACKAGE_CREDS=$ROOT/work/hackage-creds
62+
HACKAGE_TOKEN=$ROOT/work/hackage-distro-token
6363

6464
function require_400_file {
6565
if [ ! -f "$1" ]
@@ -72,7 +72,7 @@ function require_400_file {
7272
}
7373

7474
require_400_file "$SSH_DIR/id_rsa"
75-
require_400_file "$HACKAGE_CREDS"
75+
require_400_file "$HACKAGE_TOKEN"
7676

7777
mkdir -p $WORKDIR/bin
7878
BINDIR=$(cd $WORKDIR/bin ; pwd)
@@ -103,7 +103,7 @@ chmod +x stack
103103
ARGS_COMMON="--rm -v $WORKDIR:$C_HOME/work -w $C_HOME/work -v $BINDIR/curator:/usr/bin/curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $BINDIR/stack:/usr/bin/stack:ro -v $STACK_DIR:$C_HOME/.stack -v $PANTRY_DIR:$C_HOME/.stack/pantry -v $HOME/.aws/config:$C_HOME/.aws/config:ro"
104104
ARGS_PREBUILD="$ARGS_COMMON -u $USERID -e HOME=$C_HOME -v $DOT_STACKAGE_DIR:$C_HOME/.stackage"
105105
ARGS_BUILD="$ARGS_COMMON"
106-
ARGS_UPLOAD="$ARGS_PREBUILD -v $HACKAGE_CREDS:/hackage-creds:ro -v $SSH_DIR:$C_HOME/.ssh:ro -v $GITCONFIG:$C_HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY ${AWS_ENDPOINT_URL:+-e AWS_ENDPOINT_URL=$AWS_ENDPOINT_URL} -v $DOT_STACKAGE_DIR:/dot-stackage"
106+
ARGS_UPLOAD="$ARGS_PREBUILD -v $HACKAGE_TOKEN:/hackage-distro-token:ro -v $SSH_DIR:$C_HOME/.ssh:ro -v $GITCONFIG:$C_HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY ${AWS_ENDPOINT_URL:+-e AWS_ENDPOINT_URL=$AWS_ENDPOINT_URL} -v $DOT_STACKAGE_DIR:/dot-stackage"
107107

108108
# for debugging etc
109109
if [ -n "${2:-}" ]

0 commit comments

Comments
 (0)