Skip to content

Commit f92fe51

Browse files
waterfoulwaterfoul
committed
Update
1 parent f5f90a2 commit f92fe51

File tree

130 files changed

+1972
-2228
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1972
-2228
lines changed

‎Dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
6767

6868
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
6969
. /cargo/.cargo/env \
70-
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
70+
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
7171

7272
FROM scratch AS cargo
7373
COPY --link --from=cargo-build /tmp/bin/* /bin/
74-
RUN ["/bin/sarif-fmt", "--help"]
7574
RUN ["/bin/shellcheck-sarif", "--help"]
75+
RUN ["/bin/sarif-fmt", "--help"]
7676

7777
#FROM__END
7878

@@ -83,7 +83,8 @@ FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS build-platform
8383
#############################################################################################
8484
#BUILD_PLATFORM_APK__START
8585
RUN apk add --update --no-cache \
86-
curl
86+
curl \
87+
java
8788
#BUILD_PLATFORM_APK__END
8889

8990
#BUILD_PLATFORM_OTHER__START
@@ -168,7 +169,7 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
168169
&& mkdir -p "/download/snakefmt" && pip download -d "/download/snakefmt" snakefmt \
169170
&& mkdir -p "/download/proselint" && pip download -d "/download/proselint" proselint \
170171
&& mkdir -p "/download/sqlfluff" && pip download -d "/download/sqlfluff" sqlfluff \
171-
&& mkdir -p "/download/yamllint" && pip download -d "/download/yamllint" yamllint
172+
&& mkdir -p "/download/yamllint" && pip download -d "/download/yamllint" yamllint
172173

173174
#PIPVENV_DOWNLOAD__END
174175

‎flavors/ci_light/Dockerfile‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
4444

4545
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
4646
. /cargo/.cargo/env \
47-
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
47+
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
4848

4949
FROM scratch AS cargo
5050
COPY --link --from=cargo-build /tmp/bin/* /bin/
51-
RUN ["/bin/sarif-fmt", "--help"]
5251
RUN ["/bin/shellcheck-sarif", "--help"]
52+
RUN ["/bin/sarif-fmt", "--help"]
5353

5454
#FROM__END
5555

@@ -84,30 +84,37 @@ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
8484
COPY --link --from=cargo /bin/* /usr/bin/
8585
#COPY__END
8686

87-
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python-arm64
88-
RUN mkdir /export-libs && cp /lib/ld-musl-aarch64.so.1 /export-libs
89-
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python-amd64
90-
RUN mkdir /export-libs && cp /lib/ld-musl-x86_64.so.1 /export-libs
91-
FROM target-python-${TARGETARCH} AS target-python
87+
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
9288
FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
9389

9490

9591
#############################################################################################
9692
## @generated by .automation/build.py using descriptor files, please do not update manually ##
9793
#############################################################################################
9894

99-
RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
100-
10195
#PIPVENV_DOWNLOAD__START
10296
RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv \
10397
&& mkdir -p "/download/yamllint" && pip download -d "/download/yamllint" yamllint
10498

10599
#PIPVENV_DOWNLOAD__END
106100

101+
#PIPVENV_APK__START
102+
RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
103+
#PIPVENV_APK__END
104+
107105
RUN mkdir /venvs
108106

109107
COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
110-
#COPY --link --from=target-python /export-libs/* /lib
108+
109+
################################
110+
# Installs python dependencies #
111+
################################
112+
COPY megalinter /megalinter
113+
RUN mkdir -p "/venvs/megalinter" \
114+
&& cd "/venvs/megalinter" \
115+
&& python3 -m crossenv /usr/local/bin/target-python3 . \
116+
&& source bin/activate \
117+
&& PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir /megalinter
111118

112119
#############################################################################################
113120
## @generated by .automation/build.py using descriptor files, please do not update manually ##
@@ -285,15 +292,6 @@ RUN wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/
285292
#
286293
#OTHER__END
287294

288-
################################
289-
# Installs python dependencies #
290-
################################
291-
COPY megalinter /megalinter
292-
RUN PYTHONDONTWRITEBYTECODE=1 python /megalinter/setup.py install \
293-
&& PYTHONDONTWRITEBYTECODE=1 python /megalinter/setup.py clean --all \
294-
&& rm -rf /var/cache/apk/* \
295-
&& find . | grep -E "(/__pycache__$|\.pyc$|\.pyo$)" | xargs rm -rf
296-
297295
#######################################
298296
# Copy scripts and rules to container #
299297
#######################################

‎flavors/cupcake/Dockerfile‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
6363

6464
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
6565
. /cargo/.cargo/env \
66-
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
66+
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
6767

6868
FROM scratch AS cargo
6969
COPY --link --from=cargo-build /tmp/bin/* /bin/
70-
RUN ["/bin/sarif-fmt", "--help"]
7170
RUN ["/bin/shellcheck-sarif", "--help"]
71+
RUN ["/bin/sarif-fmt", "--help"]
7272

7373
#FROM__END
7474

@@ -122,20 +122,14 @@ COPY --from=kics /app/bin/assets /opt/kics/assets/
122122
COPY --link --from=cargo /bin/* /usr/bin/
123123
#COPY__END
124124

125-
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python-arm64
126-
RUN mkdir /export-libs && cp /lib/ld-musl-aarch64.so.1 /export-libs
127-
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python-amd64
128-
RUN mkdir /export-libs && cp /lib/ld-musl-x86_64.so.1 /export-libs
129-
FROM target-python-${TARGETARCH} AS target-python
125+
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
130126
FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
131127

132128

133129
#############################################################################################
134130
## @generated by .automation/build.py using descriptor files, please do not update manually ##
135131
#############################################################################################
136132

137-
RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
138-
139133
#PIPVENV_DOWNLOAD__START
140134
RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv \
141135
&& mkdir -p "/download/ansible-lint" && pip download -d "/download/ansible-lint" ansible-lint \
@@ -160,10 +154,23 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
160154

161155
#PIPVENV_DOWNLOAD__END
162156

157+
#PIPVENV_APK__START
158+
RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
159+
#PIPVENV_APK__END
160+
163161
RUN mkdir /venvs
164162

165163
COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
166-
#COPY --link --from=target-python /export-libs/* /lib
164+
165+
################################
166+
# Installs python dependencies #
167+
################################
168+
COPY megalinter /megalinter
169+
RUN mkdir -p "/venvs/megalinter" \
170+
&& cd "/venvs/megalinter" \
171+
&& python3 -m crossenv /usr/local/bin/target-python3 . \
172+
&& source bin/activate \
173+
&& PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir /megalinter
167174

168175
#############################################################################################
169176
## @generated by .automation/build.py using descriptor files, please do not update manually ##
@@ -529,15 +536,6 @@ ENV KICS_QUERIES_PATH=/opt/kics/assets/queries KICS_LIBRARIES_PATH=/opt/kics/ass
529536
#
530537
#OTHER__END
531538

532-
################################
533-
# Installs python dependencies #
534-
################################
535-
COPY megalinter /megalinter
536-
RUN PYTHONDONTWRITEBYTECODE=1 python /megalinter/setup.py install \
537-
&& PYTHONDONTWRITEBYTECODE=1 python /megalinter/setup.py clean --all \
538-
&& rm -rf /var/cache/apk/* \
539-
&& find . | grep -E "(/__pycache__$|\.pyc$|\.pyo$)" | xargs rm -rf
540-
541539
#######################################
542540
# Copy scripts and rules to container #
543541
#######################################

‎flavors/documentation/Dockerfile‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
5151

5252
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
5353
. /cargo/.cargo/env \
54-
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
54+
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
5555

5656
FROM scratch AS cargo
5757
COPY --link --from=cargo-build /tmp/bin/* /bin/
58-
RUN ["/bin/sarif-fmt", "--help"]
5958
RUN ["/bin/shellcheck-sarif", "--help"]
59+
RUN ["/bin/sarif-fmt", "--help"]
6060

6161
#FROM__END
6262

@@ -103,20 +103,14 @@ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
103103
COPY --link --from=cargo /bin/* /usr/bin/
104104
#COPY__END
105105

106-
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python-arm64
107-
RUN mkdir /export-libs && cp /lib/ld-musl-aarch64.so.1 /export-libs
108-
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python-amd64
109-
RUN mkdir /export-libs && cp /lib/ld-musl-x86_64.so.1 /export-libs
110-
FROM target-python-${TARGETARCH} AS target-python
106+
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
111107
FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
112108

113109

114110
#############################################################################################
115111
## @generated by .automation/build.py using descriptor files, please do not update manually ##
116112
#############################################################################################
117113

118-
RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
119-
120114
#PIPVENV_DOWNLOAD__START
121115
RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv \
122116
&& mkdir -p "/download/ansible-lint" && pip download -d "/download/ansible-lint" ansible-lint \
@@ -131,10 +125,23 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
131125

132126
#PIPVENV_DOWNLOAD__END
133127

128+
#PIPVENV_APK__START
129+
RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
130+
#PIPVENV_APK__END
131+
134132
RUN mkdir /venvs
135133

136134
COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
137-
#COPY --link --from=target-python /export-libs/* /lib
135+
136+
################################
137+
# Installs python dependencies #
138+
################################
139+
COPY megalinter /megalinter
140+
RUN mkdir -p "/venvs/megalinter" \
141+
&& cd "/venvs/megalinter" \
142+
&& python3 -m crossenv /usr/local/bin/target-python3 . \
143+
&& source bin/activate \
144+
&& PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir /megalinter
138145

139146
#############################################################################################
140147
## @generated by .automation/build.py using descriptor files, please do not update manually ##
@@ -378,15 +385,6 @@ RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/rel
378385
#
379386
#OTHER__END
380387

381-
################################
382-
# Installs python dependencies #
383-
################################
384-
COPY megalinter /megalinter
385-
RUN PYTHONDONTWRITEBYTECODE=1 python /megalinter/setup.py install \
386-
&& PYTHONDONTWRITEBYTECODE=1 python /megalinter/setup.py clean --all \
387-
&& rm -rf /var/cache/apk/* \
388-
&& find . | grep -E "(/__pycache__$|\.pyc$|\.pyo$)" | xargs rm -rf
389-
390388
#######################################
391389
# Copy scripts and rules to container #
392390
#######################################

‎flavors/dotnet/Dockerfile‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ RUN rustup-init -y --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-u
5151

5252
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
5353
. /cargo/.cargo/env \
54-
&& cargo install sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
54+
&& cargo install shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
5555

5656
FROM scratch AS cargo
5757
COPY --link --from=cargo-build /tmp/bin/* /bin/
58-
RUN ["/bin/sarif-fmt", "--help"]
5958
RUN ["/bin/shellcheck-sarif", "--help"]
59+
RUN ["/bin/sarif-fmt", "--help"]
6060

6161
#FROM__END
6262

@@ -103,20 +103,14 @@ COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
103103
COPY --link --from=cargo /bin/* /usr/bin/
104104
#COPY__END
105105

106-
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python-arm64
107-
RUN mkdir /export-libs && cp /lib/ld-musl-aarch64.so.1 /export-libs
108-
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python-amd64
109-
RUN mkdir /export-libs && cp /lib/ld-musl-x86_64.so.1 /export-libs
110-
FROM target-python-${TARGETARCH} AS target-python
106+
FROM --platform=$TARGETPLATFORM python:3.11.3-alpine3.17 AS target-python
111107
FROM --platform=$BUILDPLATFORM python:3.11.3-alpine3.17 AS python-venv
112108

113109

114110
#############################################################################################
115111
## @generated by .automation/build.py using descriptor files, please do not update manually ##
116112
#############################################################################################
117113

118-
RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
119-
120114
#PIPVENV_DOWNLOAD__START
121115
RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv \
122116
&& mkdir -p "/download/ansible-lint" && pip download -d "/download/ansible-lint" ansible-lint \
@@ -132,10 +126,23 @@ RUN PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir --upgrade pip crossenv
132126

133127
#PIPVENV_DOWNLOAD__END
134128

129+
#PIPVENV_APK__START
130+
RUN apk add --update --no-cache gcc musl-dev libffi-dev rust cargo cmake make g++ openssl-dev
131+
#PIPVENV_APK__END
132+
135133
RUN mkdir /venvs
136134

137135
COPY --link --from=target-python /usr/local/bin/python3 /usr/local/bin/target-python3
138-
#COPY --link --from=target-python /export-libs/* /lib
136+
137+
################################
138+
# Installs python dependencies #
139+
################################
140+
COPY megalinter /megalinter
141+
RUN mkdir -p "/venvs/megalinter" \
142+
&& cd "/venvs/megalinter" \
143+
&& python3 -m crossenv /usr/local/bin/target-python3 . \
144+
&& source bin/activate \
145+
&& PYTHONDONTWRITEBYTECODE=1 pip3 install --no-cache-dir /megalinter
139146

140147
#############################################################################################
141148
## @generated by .automation/build.py using descriptor files, please do not update manually ##
@@ -486,15 +493,6 @@ esac \
486493
#
487494
#OTHER__END
488495

489-
################################
490-
# Installs python dependencies #
491-
################################
492-
COPY megalinter /megalinter
493-
RUN PYTHONDONTWRITEBYTECODE=1 python /megalinter/setup.py install \
494-
&& PYTHONDONTWRITEBYTECODE=1 python /megalinter/setup.py clean --all \
495-
&& rm -rf /var/cache/apk/* \
496-
&& find . | grep -E "(/__pycache__$|\.pyc$|\.pyo$)" | xargs rm -rf
497-
498496
#######################################
499497
# Copy scripts and rules to container #
500498
#######################################

0 commit comments

Comments
 (0)