@@ -11,7 +11,6 @@ BUNDLE_FILE=current.bundle
1111
1212CABAL_DIR=$ROOT/cabal
1313GHC_DIR=$ROOT/ghc
14−CURATOR_DIR=$ROOT/stackage-curator
1514DOT_STACKAGE_DIR=$ROOT/dot-stackage
1615WORKDIR=$TROOT/work
1716SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
@@ -19,7 +18,6 @@ SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
1918mkdir -p \
2019 "$CABAL_DIR" \
2120 "$GHC_DIR" \
22− "$CURATOR_DIR" \
2321 "$DOT_STACKAGE_DIR" \
2422 "$WORKDIR" \
2523 "$SSH_DIR"
@@ -66,7 +64,7 @@ chmod +x stackage-curator
6664ARGS_COMMON="--rm -u $USER -v $WORKDIR:/home/stackage/work -w /home/stackage/work -v $BINDIR/stackage-curator:/usr/local/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro"
6765ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage"
6866ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/home/stackage/.ghc:ro"
69−ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro"
67+ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:/home/stackage/.stackage -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro"
7068
7169# Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely
7270docker run $ARGS_PREBUILD $IMAGE /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-} && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install"