@@ -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" \
@@ -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,