@@ -11,7 +11,6 @@ BUNDLE_FILE=current.bundle
12CABAL_DIR=$ROOT/cabal
12CABAL_DIR=$ROOT/cabal
13GHC_DIR=$ROOT/ghc
13GHC_DIR=$ROOT/ghc
14−CURATOR_DIR=$ROOT/stackage-curator
15DOT_STACKAGE_DIR=$ROOT/dot-stackage
14DOT_STACKAGE_DIR=$ROOT/dot-stackage
16WORKDIR=$TROOT/work
15WORKDIR=$TROOT/work
17SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
16SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
@@ -19,7 +18,6 @@ SSH_DIR=$ROOT/ssh-$(echo $TARGET | cut -d- -f 1)
20 "$CABAL_DIR" \
19 "$CABAL_DIR" \
21 "$GHC_DIR" \
20 "$GHC_DIR" \
23 "$DOT_STACKAGE_DIR" \
21 "$DOT_STACKAGE_DIR" \
24 "$WORKDIR" \
22 "$WORKDIR" \
25 "$SSH_DIR"
23 "$SSH_DIR"
@@ -66,7 +64,7 @@ chmod +x stackage-curator
66ARGS_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"
64ARGS_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"
67ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage"
65ARGS_PREBUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal -v $GHC_DIR:/home/stackage/.ghc -v $DOT_STACKAGE_DIR:/home/stackage/.stackage"
68ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/home/stackage/.ghc:ro"
66ARGS_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"
71# Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely
69# Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely
72docker 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"
70docker 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"