Skip to content

Commit c03af4e

Browse files
waterfoulwaterfoul
committed
Add wheel
1 parent 43d9378 commit c03af4e

File tree

41 files changed

+47
-46
lines changed

Some content is hidden

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

41 files changed

+47
-46
lines changed

‎.automation/build.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ def build_dockerfile(
646646
pipenv_download_command = (
647647
"RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \\\n"
648648
" mkdir /download \\\n"
649-
" && PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \\\n"
649+
" && PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \\\n"
650650
)
651651
pipenv_install_command = ""
652652
pipenv_path_command = 'ENV PATH="${PATH}"'

‎.github/workflows/-build-docker.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ jobs:
8686

8787
- name: Build Image
8888
uses: docker/build-push-action@v4
89+
timeout-minutes: 360 # Temp increase to see how long it takes
8990
with:
9091
file: ${{ inputs.dockerfile }}
9192
platforms: linux/amd64,linux/arm64

‎Dockerfile‎

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

101101
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
102102
. /cargo/.cargo/env \
103-
&& cargo binstall --no-confirm --no-symlinks shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
103+
&& cargo binstall --no-confirm --no-symlinks sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
104104

105105
FROM scratch AS cargo
106106
COPY --link --from=cargo-build /tmp/bin/* /bin/
107-
RUN ["/bin/shellcheck-sarif", "--help"]
108107
RUN ["/bin/sarif-fmt", "--help"]
108+
RUN ["/bin/shellcheck-sarif", "--help"]
109109

110110
#FROM__END
111111

@@ -292,7 +292,7 @@ RUN apk add --update --no-cache \
292292
#PIPVENV_DOWNLOAD__START
293293
RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \
294294
mkdir /download \
295-
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \
295+
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \
296296
&& pip download --cache-dir=/var/cache/pip --dest "/download" \
297297
ansible-lint \
298298
cpplint \

‎flavors/ci_light/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ RUN apk add --update --no-cache \
128128
#PIPVENV_DOWNLOAD__START
129129
RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \
130130
mkdir /download \
131-
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \
131+
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \
132132
&& pip download --cache-dir=/var/cache/pip --dest "/download" \
133133
yamllint
134134

‎flavors/cupcake/Dockerfile‎

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

8888
RUN --mount=type=cache,id=cargo-${TARGETARCH},sharing=locked,target=/cargo/.cargo/registry/,uid=63425 \
8989
. /cargo/.cargo/env \
90-
&& cargo binstall --no-confirm --no-symlinks shellcheck-sarif sarif-fmt --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
90+
&& cargo binstall --no-confirm --no-symlinks sarif-fmt shellcheck-sarif --root /tmp --target $([[ "${TARGETARCH}" == "amd64" ]] && echo "x86_64-unknown-linux-musl" || echo "aarch64-unknown-linux-musl")
9191

9292
FROM scratch AS cargo
9393
COPY --link --from=cargo-build /tmp/bin/* /bin/
94-
RUN ["/bin/shellcheck-sarif", "--help"]
9594
RUN ["/bin/sarif-fmt", "--help"]
95+
RUN ["/bin/shellcheck-sarif", "--help"]
9696

9797
#FROM__END
9898

@@ -261,7 +261,7 @@ RUN apk add --update --no-cache \
261261
#PIPVENV_DOWNLOAD__START
262262
RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \
263263
mkdir /download \
264-
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \
264+
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \
265265
&& pip download --cache-dir=/var/cache/pip --dest "/download" \
266266
ansible-lint \
267267
cpplint \

‎flavors/documentation/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ RUN apk add --update --no-cache \
169169
#PIPVENV_DOWNLOAD__START
170170
RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \
171171
mkdir /download \
172-
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \
172+
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \
173173
&& pip download --cache-dir=/var/cache/pip --dest "/download" \
174174
ansible-lint \
175175
djlint \

‎flavors/dotnet/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ RUN apk add --update --no-cache \
172172
#PIPVENV_DOWNLOAD__START
173173
RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \
174174
mkdir /download \
175-
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \
175+
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \
176176
&& pip download --cache-dir=/var/cache/pip --dest "/download" \
177177
ansible-lint \
178178
cpplint \

‎flavors/dotnetweb/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ RUN apk add --update --no-cache \
192192
#PIPVENV_DOWNLOAD__START
193193
RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \
194194
mkdir /download \
195-
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \
195+
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \
196196
&& pip download --cache-dir=/var/cache/pip --dest "/download" \
197197
ansible-lint \
198198
cpplint \

‎flavors/go/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ RUN apk add --update --no-cache \
184184
#PIPVENV_DOWNLOAD__START
185185
RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \
186186
mkdir /download \
187-
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \
187+
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \
188188
&& pip download --cache-dir=/var/cache/pip --dest "/download" \
189189
ansible-lint \
190190
djlint \

‎flavors/java/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ RUN apk add --update --no-cache \
169169
#PIPVENV_DOWNLOAD__START
170170
RUN --mount=type=cache,id=pip,sharing=locked,target=/var/cache/pip,uid=0 \
171171
mkdir /download \
172-
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv \
172+
&& PYTHONDONTWRITEBYTECODE=1 pip3 --disable-pip-version-check install --cache-dir=/var/cache/pip --upgrade pip crossenv wheel \
173173
&& pip download --cache-dir=/var/cache/pip --dest "/download" \
174174
ansible-lint \
175175
djlint \

0 commit comments

Comments
 (0)