Skip to content

Commit

Permalink
Merge tag '0.3.2'
Browse files Browse the repository at this point in the history
Nirum 0.3.2
  • Loading branch information
dahlia committed Mar 15, 2018
2 parents 48faf4f + d5b7350 commit 424a0f9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -5,7 +5,7 @@ __pycache__
.stack-work
*.tix
*.pyc

.pytest_cache
.tox
*.egg-info
*.cabal
Expand Down
2 changes: 2 additions & 0 deletions .hadolint.yaml
@@ -0,0 +1,2 @@
ignored:
- DL3018
10 changes: 10 additions & 0 deletions CHANGES.md
Expand Up @@ -57,6 +57,16 @@ To be released.
[python2-unicode]: https://docs.python.org/2/library/functions.html#unicode


Version 0.3.2
-------------

Released on March 15, 2018.

### Et cetera

- Fixed a broken build of the official Docker images.


Version 0.3.1
-------------

Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Expand Up @@ -4,11 +4,11 @@
FROM alpine:3.7 AS build

RUN apk add --no-cache \
bash=4.4.19-r1 \
build-base=0.5-r0 \
curl=7.58.0-r0 \
ghc=8.0.2-r6 \
zlib-dev=1.2.11-r1
bash~4.4.19 \
build-base~0.5 \
curl~7.58.0 \
ghc~8.0.2 \
zlib-dev~1.2.11
RUN curl -sSL https://get.haskellstack.org/ | bash

RUN stack config set system-ghc --global true
Expand All @@ -33,7 +33,7 @@ RUN stack build --flag nirum:static --copy-bins

FROM alpine:3.7

RUN apk add --no-cache bash=4.4.19-r1
RUN apk add --no-cache bash~4.4.19

RUN mkdir -p /bin
COPY --from=build /root/.local/bin/nirum /bin/
Expand Down

0 comments on commit 424a0f9

Please sign in to comment.