Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix docker images to work with cql-io-1.1.0 #697

Merged
merged 5 commits into from Apr 1, 2019
Merged

fix docker images to work with cql-io-1.1.0 #697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce2f8dd
Cleanup Dockerfiles.
fisx Mar 28, 2019
d9422c5
Dockerfile.prebuilder: pull in unreleased stack to fix a bug.
fisx Mar 28, 2019
09bfc9b
Use system-ghc.
fisx Mar 31, 2019
cfedd53
Mangling stack's snapshot appears to be unnecessary.
fisx Mar 31, 2019
fa95a5b
Revert "Mangling stack's snapshot appears to be unnecessary."
fisx Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions build/alpine/Dockerfile.builder
View file
Open in desktop
Expand Up @@ -14,6 +14,9 @@ WORKDIR /
#
# Finally, we build docs for haskell-src-exts without hyperlinking enabled
# to avoid a Haddock segfault. See https://github.com/haskell/haddock/issues/928
#
# Note: git, ncurses, sed are added here for historical reasons; since
# roughly 2019-03-28, they are included in prebuilder as well.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If they are in the prebuilder, why not remove them from here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only so that builder will work with old prebuilder, until everything has been updated. (the point of builder is that it doesn't have to rebuild prebuilder every time it's built, right?)


RUN apk add --no-cache git ncurses sed && \
git clone -b develop https://github.com/wireapp/wire-server.git && \
Expand Down
15 changes: 14 additions & 1 deletion build/alpine/Dockerfile.prebuilder
View file
Open in desktop
Expand Up @@ -33,10 +33,23 @@ RUN apk add --no-cache \
llvm-libunwind-dev \
bash \
xz \
libxml2-dev
libxml2-dev \
git \
ncurses \
sed

# get static version of Haskell Stack and use system ghc by default
ARG STACK_ALPINE_VERSION=1.9.1
RUN curl -sSfL https://github.com/commercialhaskell/stack/releases/download/v${STACK_ALPINE_VERSION}/stack-${STACK_ALPINE_VERSION}-linux-x86_64-static.tar.gz \
| tar --wildcards -C /usr/local/bin --strip-components=1 -xzvf - '*/stack' && chmod 755 /usr/local/bin/stack && \
stack config set system-ghc --global true

# upgrade stack to current master (2019-03-28). this fixes an issue
# with building internal libraries as used in cql-io-1.1.0.
# details: https://github.com/commercialhaskell/stack/pull/4596
RUN git clone https://github.com/commercialhaskell/stack && \
cd stack && \
git checkout f0b66a1ab60fb5be85f6cb60491915bf53d3cd3c && \
sed -i -e 's/lts-12.20/lts-12.14/' snapshot-lts-12.yaml && \
stack install --system-ghc --stack-yaml=stack-lts-12.yaml --system-ghc && \
cp /root/.local/bin/stack /usr/local/bin/stack