Skip to content

Commit c2aae45

Browse files
author
Robbert Müller
committed
Merge branch 'renovate/docker-alpine-3.x' into 'master'
⬆️ Updates alpine Docker tag to v3.12.0 See merge request pipeline-components/shellcheck!13
2 parents b35e522 + d8c1ae0 commit c2aae45

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Dockerfile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
1-
FROM alpine:3.11.6 as build
2-
3-
RUN apk --no-cache add curl=7.67.0-r0 cabal=2.4.1.0-r0 ghc=8.6.5-r3 build-base=0.5-r1 upx=3.95-r2
1+
FROM alpine:3.12.0 as build
2+
3+
RUN apk --no-cache add \
4+
curl=7.69.1-r0 \
5+
cabal=3.2.0.0-r0 \
6+
ghc=8.8.3-r0 \
7+
build-base=0.5-r2 \
8+
upx=3.96-r0
49
RUN mkdir -p /app/shellcheck
510
WORKDIR /app/shellcheck
611

712
RUN cabal update
8-
RUN cabal install --jobs --enable-executable-stripping --enable-optimization=2 --enable-shared --enable-split-sections --disable-debug-info ShellCheck-0.6.0
13+
RUN cabal install --jobs --enable-executable-stripping --enable-optimization=2 --enable-shared --enable-split-sections --disable-debug-info ShellCheck-0.7.1
914

15+
RUN cp "$(readlink -f /root/.cabal/bin/shellcheck)" /root/.cabal/bin/shellcheck
1016
RUN upx -9 /root/.cabal/bin/shellcheck
1117

1218
FROM pipelinecomponents/base-entrypoint:0.2.0 as entrypoint
1319

14-
FROM alpine:3.11.6
20+
FROM alpine:3.12.0
1521
COPY --from=entrypoint /entrypoint.sh /entrypoint.sh
1622
ENTRYPOINT ["/entrypoint.sh"]
1723
ENV DEFAULTCMD shellcheck
1824

19-
RUN apk --no-cache add libffi=3.2.1-r6 libgmpxx=6.1.2-r1 parallel=20191122-r0
25+
RUN apk --no-cache add libffi=3.3-r2 libgmpxx=6.2.0-r0 parallel=20200522-r0
2026
COPY --from=build /root/.cabal/bin/shellcheck /usr/local/bin/shellcheck
2127

2228
WORKDIR /code/

0 commit comments

Comments
 (0)