Skip to content

Commit 52d8cc3

Browse files
author
Robbert Müller
committed
Merge branch 'renovate/alpine-3.x' into 'main'
🔼 Update shellcheck 0.10.0 See merge request pipeline-components/shellcheck!45
2 parents e297145 + 9a40f00 commit 52d8cc3

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

Dockerfile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM alpine:3.17.10 as build
1+
FROM alpine:3.21.2 AS build
22

33
# hadolint ignore=DL3018
44
RUN apk --no-cache add \
55
curl \
6-
cabal=3.8.1.0-r2\
7-
ghc=9.0.2-r1 \
6+
cabal \
7+
ghc \
88
build-base \
99
libffi-dev \
1010
upx
@@ -13,15 +13,16 @@ COPY app /app/
1313
RUN mkdir -p /app/shellcheck
1414
WORKDIR /app/shellcheck
1515

16-
RUN cabal update && \
17-
cabal install --jobs --enable-executable-stripping --enable-optimization=2 --enable-shared --enable-split-sections --disable-debug-info ShellCheck-0.8.0
16+
RUN \
17+
cabal update && \
18+
cabal install --jobs --enable-executable-stripping --enable-optimization=2 --enable-shared --enable-split-sections --disable-debug-info ShellCheck-0.10.0
1819

19-
RUN cp "$(readlink -f /root/.cabal/bin/shellcheck)" /root/.cabal/bin/shellcheck && \
20-
upx -9 /root/.cabal/bin/shellcheck
20+
RUN cp "$(readlink -f /root/.local/bin/shellcheck)" /root/.local/bin/shellcheck && \
21+
upx -9 /root/.local/bin/shellcheck
2122

2223
FROM pipelinecomponents/base-entrypoint:0.5.0 as entrypoint
2324

24-
FROM alpine:3.17.10
25+
FROM alpine:3.21.2
2526
COPY --from=entrypoint /entrypoint.sh /entrypoint.sh
2627
ENTRYPOINT ["/entrypoint.sh"]
2728
ENV DEFAULTCMD shellcheck
@@ -30,7 +31,7 @@ COPY app /app/
3031

3132
# hadolint ignore=DL3018
3233
RUN apk --no-cache add libffi libgmpxx parallel bash
33-
COPY --from=build /root/.cabal/bin/shellcheck /usr/local/bin/shellcheck
34+
COPY --from=build /root/.local/bin/shellcheck /usr/local/bin/shellcheck
3435

3536
WORKDIR /code/
3637
# Build arguments

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ SOFTWARE.
108108
[gitlabci]: https://gitlab.com/pipeline-components/shellcheck/-/commits/master
109109
[issue]: https://gitlab.com/pipeline-components/shellcheck/issues
110110
[keepchangelog]: http://keepachangelog.com/en/1.0.0/
111-
[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
111+
[maintenance-shield]: https://img.shields.io/maintenance/yes/2025.svg
112112
[project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20ready-brightgreen.svg
113113
[pulls-shield]: https://img.shields.io/docker/pulls/pipelinecomponents/shellcheck.svg
114114
[releases]: https://gitlab.com/pipeline-components/shellcheck/tags

0 commit comments

Comments
 (0)