Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updates #691

Merged
merged 1 commit into from
Jul 1, 2023
Merged

updates #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -285,7 +285,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -371,7 +371,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -479,7 +479,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -565,7 +565,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -651,7 +651,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -737,7 +737,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -823,7 +823,7 @@ jobs:
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ jobs:
with:
fetch-depth: 0
- name: Set up QEMU
uses: docker/setup-qemu-action@v2.1.0
uses: docker/setup-qemu-action@v2.2.0
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2.5.0
uses: docker/setup-buildx-action@v2.8.0
with:
version: v0.10.2
driver-opts: |
Expand Down Expand Up @@ -129,14 +129,14 @@ jobs:
sarif_file: 'trivy-results.sarif'
if: always() && github.repository == 'hairyhenderson/dockerfiles'
- name: Login to GHCR
uses: docker/login-action@v2.1.0
uses: docker/login-action@v2.2.0
with:
registry: ghcr.io
username: '{{ `${{ github.actor }}` }}'
password: '{{ `${{ secrets.GHCR_TOKEN }}` }}'
if: github.repository == 'hairyhenderson/dockerfiles' && github.actor == 'hairyhenderson' && github.ref == 'refs/heads/main'
- name: Login to DockerHub
uses: docker/login-action@v2.1.0
uses: docker/login-action@v2.2.0
with:
username: '{{ `${{ github.actor }}` }}'
password: '{{ `${{ secrets.DOCKERHUB_TOKEN }}` }}'
Expand Down
8 changes: 4 additions & 4 deletions ci-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM vault:1.13.2 AS vault
FROM consul:1.15.3 AS consul
FROM vault:1.13.3 AS vault
FROM consul:1.15.4 AS consul
FROM docker:24.0 AS docker
FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
FROM docker/buildx-bin:0.10.5 AS buildx-plugin
FROM golangci/golangci-lint:v1.53.2-alpine AS golangci-lint
FROM docker/buildx-bin:0.11.0 AS buildx-plugin
FROM golangci/golangci-lint:v1.53.3-alpine AS golangci-lint

FROM alpine:3.18 AS cc-test-reporter

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ghcr.io/hairyhenderson/gomplate:v3 AS gomplate
FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
FROM docker:24.0 AS docker
FROM docker/buildx-bin:0.10.5 AS buildx-plugin
FROM docker/buildx-bin:0.11.0 AS buildx-plugin
FROM mikefarah/yq:4 AS yq

FROM alpine:3.18 AS runtime
Expand Down
8 changes: 4 additions & 4 deletions gomplate-ci-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM vault:1.13.2 AS vault
FROM consul:1.15.3 AS consul
FROM vault:1.13.3 AS vault
FROM consul:1.15.4 AS consul
FROM docker:24.0 AS docker
FROM ghcr.io/hairyhenderson/bashbrew:latest AS bashbrew
FROM docker/buildx-bin:0.10.5 AS buildx-plugin
FROM golangci/golangci-lint:v1.53.2-alpine AS golangci-lint
FROM docker/buildx-bin:0.11.0 AS buildx-plugin
FROM golangci/golangci-lint:v1.53.3-alpine AS golangci-lint

FROM alpine:3.18 AS cc-test-reporter

Expand Down