@@ -18,7 +18,8 @@ fi
1818IMAGE=commercialhaskell/stackage:$TAG
1919
2020CABAL_DIR=$ROOT/cabal
21−STACK_DIR=$ROOT/stack
21+PANTRY_DIR=$ROOT/pantry
22+STACK_DIR=$ROOT/stack-$TAG
2223GHC_DIR=$ROOT/ghc
2324DOT_STACKAGE_DIR=$ROOT/dot-stackage
2425WORKDIR=$ROOT/$TAG/work
@@ -28,6 +29,7 @@ USERID=$(id -u)
2829
2930mkdir -p \
3031 "$CABAL_DIR" \
32+ "$PANTRY_DIR" \
3133 "$STACK_DIR" \
3234 "$GHC_DIR" \
3335 "$DOT_STACKAGE_DIR" \
@@ -61,7 +63,7 @@ BINDIR=$(cd $ROOT/bin ; pwd)
6163(
6264cd $BINDIR
6365rm -f stackage-curator stackage-curator-2*.bz2
64−CURATOR2=stackage-curator-2-7e65b644121812d9a3a8b24d7130bb8865485f8f
66+CURATOR2=stackage-curator-2-7e161449fa1b63a7e41299f3f87bd6f3d7e13082
6567wget "https://download.fpcomplete.com/stackage-curator-2/$CURATOR2.bz2"
6668bunzip2 "$CURATOR2.bz2"
6769chmod +x $CURATOR2
@@ -69,8 +71,10 @@ mv $CURATOR2 stackage-curator
6971./stackage-curator --version
7072)
7173
72−
73−ARGS_COMMON="--rm -v $WORKDIR:$HOME/work -w $HOME/work -v $BINDIR/stackage-curator:/usr/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $BINDIR/stack:/usr/bin/stack:ro -v $STACK_DIR:$HOME/.stack"
74+# We share pantry directory between snapshots while the other content in .stack
75+# is stored separately (because e.g. Ubuntu releases between LTS and nightly
76+# could differ). Also the order of binds is important.
77+ARGS_COMMON="--rm -v $WORKDIR:$HOME/work -w $HOME/work -v $BINDIR/stackage-curator:/usr/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $BINDIR/stack:/usr/bin/stack:ro -v $STACK_DIR:$HOME/.stack -v $PANTRY_DIR:$HOME/.stack/pantry"
7478ARGS_PREBUILD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $CABAL_DIR:$HOME/.cabal -v $GHC_DIR:$HOME/.ghc -v $DOT_STACKAGE_DIR:$HOME/.stackage"
7579ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:$HOME/.cabal:ro -v $GHC_DIR:$HOME/.ghc:ro"
7680# instance-data is an undocumented feature of S3 used by amazonka,
@@ -90,7 +94,7 @@ fi
9094(
9195cd $BINDIR
9296rm -f stack stack-*.bz2
93−STACK=stack-7e65b644121812d9a3a8b24d7130bb8865485f8f
97+STACK=stack-7e161449fa1b63a7e41299f3f87bd6f3d7e13082
9498wget "https://download.fpcomplete.com/stackage-curator-2/$STACK.bz2"
9599bunzip2 "$STACK.bz2"
96100chmod +x $STACK
@@ -128,7 +132,7 @@ esac
128132# Now do the actual build. We need to first set the owner of the home directory
129133# correctly, so we run the command as root, change owner, and then use sudo to
130134# switch back to the current user
131−docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator build --jobs $JOBS"
135+docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator build --jobs $JOBS" 2>&1 | tee "$SHORTNAME-build.log"
132136
133137# Make sure we actually need this snapshot. We used to perform this check
134138# exclusively before building. Now we perform it after as well for the case of