File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ cat >$GITCONFIG <<EOF
5959 name = Stackage Build host
6060EOF
6161
62- HACKAGE_CREDS =$ROOT /work/hackage-creds
62+ HACKAGE_TOKEN =$ROOT /work/hackage-distro-token
6363
6464function require_400_file {
6565 if [ ! -f " $1 " ]
@@ -72,7 +72,7 @@ function require_400_file {
7272}
7373
7474require_400_file " $SSH_DIR /id_rsa"
75- require_400_file " $HACKAGE_CREDS "
75+ require_400_file " $HACKAGE_TOKEN "
7676
7777mkdir -p $WORKDIR /bin
7878BINDIR=$( cd $WORKDIR /bin ; pwd)
@@ -103,7 +103,7 @@ chmod +x stack
103103ARGS_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"
104104ARGS_PREBUILD=" $ARGS_COMMON -u $USERID -e HOME=$C_HOME -v $DOT_STACKAGE_DIR :$C_HOME /.stackage"
105105ARGS_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
109109if [ -n " ${2:- } " ]
You can’t perform that action at this time.
0 commit comments