Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker-img-apk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
tags:
- v*
pull_request:
paths: ['img/apk/*']
paths: ['img/apk/*','.github/workflows/docker-build-template.yml','.github/workflows/docker-img-apk.yml']

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-img-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
tags:
- v*
pull_request:
paths: ['img/go/*']
paths: ['img/go/*','.github/workflows/docker-build-template.yml','.github/workflows/docker-img-go.yml']

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-img-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
tags:
- v*
pull_request:
paths: ['img/npm/*']
paths: ['img/npm/*','.github/workflows/docker-build-template.yml','.github/workflows/docker-img-npm.yml']

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-img-pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
tags:
- v*
pull_request:
paths: ['img/pip/*']
paths: ['img/pip/*','.github/workflows/docker-build-template.yml','.github/workflows/docker-img-pip.yml']

jobs:
build:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/docker-push-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ on:

jobs:
push-dockerhub:
runs-on: ubuntu-latest
runs-on: ${{ matrix.runner }}
if: github.event_name == 'push'

strategy:
matrix:
runner: [ubuntu-latest, ubuntu-24.04-arm]

permissions:
contents: read
packages: write
Expand Down
16 changes: 8 additions & 8 deletions img/apk/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM alpine:3.13.0 AS clang_layer
RUN apk --no-cache add clang
FROM alpine:3.22.0 AS clang_layer
RUN apk --no-cache add clang20-extra-tools
# RUN ldd /usr/bin/clang-format && exit 1

FROM alpine:3.13.0
FROM alpine:3.22.0

# hadolint ignore=DL3059
RUN adduser -D standards
Expand All @@ -10,11 +11,10 @@ RUN adduser -D standards

# [ OS pkgs] - We pull clang-format out specifically because we don't need the rest of clang
# hadolint ignore=DL3059
RUN apk --no-cache add gmp libxml2
COPY --from=clang_layer /usr/lib/libclang-cpp.so.10 /usr/lib/libclang-cpp.so.10
COPY --from=clang_layer /usr/lib/libffi.so.7 /usr/lib/libffi.so.7
COPY --from=clang_layer /usr/lib/libLLVM-10.so /usr/lib/libLLVM-10.so
RUN apk --no-cache add gmp libxml2 libffi
COPY --from=clang_layer /usr/lib/llvm20/lib/libclang-cpp.so.20.1 /usr/lib/llvm20/lib/libclang-cpp.so.20.1
COPY --from=clang_layer /usr/lib/llvm20/lib/libLLVM.so.20.1 /usr/lib/llvm20/lib/libLLVM.so.20.1
COPY --from=clang_layer /usr/bin/clang-format /bin/clang-format
RUN apk --no-cache add cppcheck asciidoctor

RUN echo test
USER standards
4 changes: 2 additions & 2 deletions img/go/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.24-alpine3.21 AS go_layer
FROM golang:1.24-alpine3.22 AS go_layer
RUN apk --no-cache add git wget
ENV CGO_ENABLED=0

Expand All @@ -11,7 +11,7 @@ RUN go install github.com/errata-ai/vale@latest
RUN go install github.com/yoheimuta/protolint/cmd/protolint@latest


FROM alpine:3.13.0
FROM alpine:3.22.0

RUN adduser -D standards

Expand Down
2 changes: 1 addition & 1 deletion img/npm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:22-alpine
FROM node:22-alpine3.22

RUN adduser -D standards

Expand Down
2 changes: 1 addition & 1 deletion img/pip/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3-alpine
FROM python:3-alpine3.22

# [ Pips ]
ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
Expand Down
2 changes: 1 addition & 1 deletion verify/lang/go/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM golang:1.24.4-alpine
FROM golang:1.24.4-alpine3.22
COPY src/ /src/
WORKDIR /src/
RUN go build /src/gol.go
2 changes: 1 addition & 1 deletion verify/lang/groovy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

FROM groovy:3.0-alpine
FROM groovy:3.0-alpine3.22
COPY src/ /src/
CMD ["groovy","/src/hello.groovy"]
2 changes: 1 addition & 1 deletion verify/lang/python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

FROM python:3.13.5-alpine
FROM python:3.13.5-alpine3.22
COPY src/ /src/
CMD ["python","/src/gol.py"]
Loading