Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/pre-commit/action-…
Browse files Browse the repository at this point in the history
…3.0.1
  • Loading branch information
ben-harvey authored Dec 11, 2024
2 parents 55525e9 + 64f5c02 commit 34a1755
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/_docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
run: cat docker.env >> $GITHUB_ENV

- name: Build Docker image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: ${{ inputs.dockerfile }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Build and export
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
load: true
Expand Down
2 changes: 1 addition & 1 deletion latest.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20.2 AS install
FROM alpine:3.21.0 AS install

RUN apk add --update --no-cache \
curl \
Expand Down
2 changes: 1 addition & 1 deletion playwright.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20.2 as install
FROM alpine:3.21.0 as install

Check warning on line 1 in playwright.Dockerfile

View workflow job for this annotation

GitHub Actions / Build and push 'playwright' image / Build and test the runner image

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

RUN apk add --update --no-cache \
curl \
Expand Down

0 comments on commit 34a1755

Please sign in to comment.