Skip to content

Commit a111949

Browse files
bdovazbdovaz
committed
Fix buildx command
1 parent 201f062 commit a111949

File tree

128 files changed

+1023
-384
lines changed

Some content is hidden

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

128 files changed

+1023
-384
lines changed

‎.github/workflows/deploy-DEV-linters.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ jobs:
220220
BUILD_DATE=${{ env.BUILD_DATE }}
221221
BUILD_REVISION=${{ github.sha }}
222222
BUILD_VERSION=${{ github.sha }}
223-
load: true
223+
load: false
224224
push: false
225225
secrets: |
226226
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
@@ -238,8 +238,12 @@ jobs:
238238
239239
TEST_KEYWORDS_TO_USE_UPPER="${{ matrix.linter }}"
240240
TEST_KEYWORDS_TO_USE="${TEST_KEYWORDS_TO_USE_UPPER,,}"
241-
242-
docker run -e TEST_CASE_RUN=true -e OUTPUT_FORMAT=text -e OUTPUT_FOLDER=${{ github.sha }} -e OUTPUT_DETAIL=detailed -e GITHUB_SHA=${{ github.sha }} -e GITHUB_REPOSITORY=${GITHUB_REPOSITORY} -e GITHUB_BRANCH=${GITHUB_BRANCH} -e PAT="${{ secrets.PAT }}" -e TEST_KEYWORDS="${TEST_KEYWORDS_TO_USE}" -e MEGALINTER_VOLUME_ROOT="${GITHUB_WORKSPACE}" -v "/var/run/docker.sock:/var/run/docker.sock:rw" -v ${GITHUB_WORKSPACE}:/tmp/lint oxsecurity/megalinter-only-${{ matrix.linter }}:${{ needs.prepare.outputs.tag }}
241+
242+
docker buildx build --platform linux/amd64 -f linters/${{ matrix.linter }}/Dockerfile --load --tag oxsecurity/megalinter-only-${{ matrix.linter }}:${{ needs.prepare.outputs.tag }} .
243+
docker buildx build --platform linux/arm64 -f linters/${{ matrix.linter }}/Dockerfile --load --tag oxsecurity/megalinter-only-${{ matrix.linter }}:${{ needs.prepare.outputs.tag }}-arm64 .
244+
245+
docker run --plaform linux/amd64 -e TEST_CASE_RUN=true -e OUTPUT_FORMAT=text -e OUTPUT_FOLDER=${{ github.sha }} -e OUTPUT_DETAIL=detailed -e GITHUB_SHA=${{ github.sha }} -e GITHUB_REPOSITORY=${GITHUB_REPOSITORY} -e GITHUB_BRANCH=${GITHUB_BRANCH} -e PAT="${{ secrets.PAT }}" -e TEST_KEYWORDS="${TEST_KEYWORDS_TO_USE}" -e MEGALINTER_VOLUME_ROOT="${GITHUB_WORKSPACE}" -v "/var/run/docker.sock:/var/run/docker.sock:rw" -v ${GITHUB_WORKSPACE}:/tmp/lint oxsecurity/megalinter-only-${{ matrix.linter }}:${{ needs.prepare.outputs.tag }}
246+
docker run --plaform linux/amd64 -e TEST_CASE_RUN=true -e OUTPUT_FORMAT=text -e OUTPUT_FOLDER=${{ github.sha }} -e OUTPUT_DETAIL=detailed -e GITHUB_SHA=${{ github.sha }} -e GITHUB_REPOSITORY=${GITHUB_REPOSITORY} -e GITHUB_BRANCH=${GITHUB_BRANCH} -e PAT="${{ secrets.PAT }}" -e TEST_KEYWORDS="${TEST_KEYWORDS_TO_USE}" -e MEGALINTER_VOLUME_ROOT="${GITHUB_WORKSPACE}" -v "/var/run/docker.sock:/var/run/docker.sock:rw" -v ${GITHUB_WORKSPACE}:/tmp/lint oxsecurity/megalinter-only-${{ matrix.linter }}:${{ needs.prepare.outputs.tag }}-arm64
243247
timeout-minutes: 30
244248

245249
##############################################

‎flavors/ci_light/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,20 @@ FROM zricethezav/gitleaks:v8.16.0 as gitleaks
2222
##################
2323
# Get base image #
2424
##################
25+
# https://stackoverflow.com/a/73711302/699056
2526
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
2627

2728
FROM python:3.11.2-alpine3.17
2829
ARG GITHUB_TOKEN
2930

31+
# https://stackoverflow.com/a/73711302/699056
3032
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
31-
# add this line to resolve
32-
RUN apk add libc6-compat \
33-
gcompat
33+
# https://stackoverflow.com/a/73711302/699056
34+
# https://stackoverflow.com/a/73359981/699056
35+
# https://stackoverflow.com/a/71209637/699056
36+
RUN apk add --update libc6-compat \
37+
gcompat \
38+
qemu-x86_64
3439

3540
#############################################################################################
3641
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/cupcake/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,20 @@ FROM checkmarx/kics:alpine as kics
4040
##################
4141
# Get base image #
4242
##################
43+
# https://stackoverflow.com/a/73711302/699056
4344
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
4445

4546
FROM python:3.11.2-alpine3.17
4647
ARG GITHUB_TOKEN
4748

49+
# https://stackoverflow.com/a/73711302/699056
4850
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
49-
# add this line to resolve
50-
RUN apk add libc6-compat \
51-
gcompat
51+
# https://stackoverflow.com/a/73711302/699056
52+
# https://stackoverflow.com/a/73359981/699056
53+
# https://stackoverflow.com/a/71209637/699056
54+
RUN apk add --update libc6-compat \
55+
gcompat \
56+
qemu-x86_64
5257

5358
#############################################################################################
5459
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/documentation/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,20 @@ FROM zricethezav/gitleaks:v8.16.0 as gitleaks
2929
##################
3030
# Get base image #
3131
##################
32+
# https://stackoverflow.com/a/73711302/699056
3233
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
3334

3435
FROM python:3.11.2-alpine3.17
3536
ARG GITHUB_TOKEN
3637

38+
# https://stackoverflow.com/a/73711302/699056
3739
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
38-
# add this line to resolve
39-
RUN apk add libc6-compat \
40-
gcompat
40+
# https://stackoverflow.com/a/73711302/699056
41+
# https://stackoverflow.com/a/73359981/699056
42+
# https://stackoverflow.com/a/71209637/699056
43+
RUN apk add --update libc6-compat \
44+
gcompat \
45+
qemu-x86_64
4146

4247
#############################################################################################
4348
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/dotnet/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,20 @@ FROM zricethezav/gitleaks:v8.16.0 as gitleaks
2929
##################
3030
# Get base image #
3131
##################
32+
# https://stackoverflow.com/a/73711302/699056
3233
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
3334

3435
FROM python:3.11.2-alpine3.17
3536
ARG GITHUB_TOKEN
3637

38+
# https://stackoverflow.com/a/73711302/699056
3739
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
38-
# add this line to resolve
39-
RUN apk add libc6-compat \
40-
gcompat
40+
# https://stackoverflow.com/a/73711302/699056
41+
# https://stackoverflow.com/a/73359981/699056
42+
# https://stackoverflow.com/a/71209637/699056
43+
RUN apk add --update libc6-compat \
44+
gcompat \
45+
qemu-x86_64
4146

4247
#############################################################################################
4348
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/go/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,20 @@ FROM zricethezav/gitleaks:v8.16.0 as gitleaks
3535
##################
3636
# Get base image #
3737
##################
38+
# https://stackoverflow.com/a/73711302/699056
3839
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
3940

4041
FROM python:3.11.2-alpine3.17
4142
ARG GITHUB_TOKEN
4243

44+
# https://stackoverflow.com/a/73711302/699056
4345
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
44-
# add this line to resolve
45-
RUN apk add libc6-compat \
46-
gcompat
46+
# https://stackoverflow.com/a/73711302/699056
47+
# https://stackoverflow.com/a/73359981/699056
48+
# https://stackoverflow.com/a/71209637/699056
49+
RUN apk add --update libc6-compat \
50+
gcompat \
51+
qemu-x86_64
4752

4853
#############################################################################################
4954
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/java/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,20 @@ FROM zricethezav/gitleaks:v8.16.0 as gitleaks
2929
##################
3030
# Get base image #
3131
##################
32+
# https://stackoverflow.com/a/73711302/699056
3233
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
3334

3435
FROM python:3.11.2-alpine3.17
3536
ARG GITHUB_TOKEN
3637

38+
# https://stackoverflow.com/a/73711302/699056
3739
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
38-
# add this line to resolve
39-
RUN apk add libc6-compat \
40-
gcompat
40+
# https://stackoverflow.com/a/73711302/699056
41+
# https://stackoverflow.com/a/73359981/699056
42+
# https://stackoverflow.com/a/71209637/699056
43+
RUN apk add --update libc6-compat \
44+
gcompat \
45+
qemu-x86_64
4146

4247
#############################################################################################
4348
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/javascript/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,20 @@ FROM zricethezav/gitleaks:v8.16.0 as gitleaks
2828
##################
2929
# Get base image #
3030
##################
31+
# https://stackoverflow.com/a/73711302/699056
3132
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
3233

3334
FROM python:3.11.2-alpine3.17
3435
ARG GITHUB_TOKEN
3536

37+
# https://stackoverflow.com/a/73711302/699056
3638
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
37-
# add this line to resolve
38-
RUN apk add libc6-compat \
39-
gcompat
39+
# https://stackoverflow.com/a/73711302/699056
40+
# https://stackoverflow.com/a/73359981/699056
41+
# https://stackoverflow.com/a/71209637/699056
42+
RUN apk add --update libc6-compat \
43+
gcompat \
44+
qemu-x86_64
4045

4146
#############################################################################################
4247
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/php/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,20 @@ FROM zricethezav/gitleaks:v8.16.0 as gitleaks
2828
##################
2929
# Get base image #
3030
##################
31+
# https://stackoverflow.com/a/73711302/699056
3132
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
3233

3334
FROM python:3.11.2-alpine3.17
3435
ARG GITHUB_TOKEN
3536

37+
# https://stackoverflow.com/a/73711302/699056
3638
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
37-
# add this line to resolve
38-
RUN apk add libc6-compat \
39-
gcompat
39+
# https://stackoverflow.com/a/73711302/699056
40+
# https://stackoverflow.com/a/73359981/699056
41+
# https://stackoverflow.com/a/71209637/699056
42+
RUN apk add --update libc6-compat \
43+
gcompat \
44+
qemu-x86_64
4045

4146
#############################################################################################
4247
## @generated by .automation/build.py using descriptor files, please do not update manually ##

‎flavors/python/Dockerfile‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,20 @@ FROM zricethezav/gitleaks:v8.16.0 as gitleaks
2929
##################
3030
# Get base image #
3131
##################
32+
# https://stackoverflow.com/a/73711302/699056
3233
FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
3334

3435
FROM python:3.11.2-alpine3.17
3536
ARG GITHUB_TOKEN
3637

38+
# https://stackoverflow.com/a/73711302/699056
3739
COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/
38-
# add this line to resolve
39-
RUN apk add libc6-compat \
40-
gcompat
40+
# https://stackoverflow.com/a/73711302/699056
41+
# https://stackoverflow.com/a/73359981/699056
42+
# https://stackoverflow.com/a/71209637/699056
43+
RUN apk add --update libc6-compat \
44+
gcompat \
45+
qemu-x86_64
4146

4247
#############################################################################################
4348
## @generated by .automation/build.py using descriptor files, please do not update manually ##

0 commit comments

Comments
 (0)