Skip to content

Commit

Permalink
use general version
Browse files Browse the repository at this point in the history
  • Loading branch information
WolfangAukang committed Oct 3, 2023
1 parent df011d9 commit 4be1a10
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4
- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
uses: ludeeus/action-shellcheck@2.0.0
with:
severity: error
14 changes: 7 additions & 7 deletions .github/workflows/simplerisk-jammy-push_to_github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 #v2.6.0
uses: sigstore/cosign-installer@v3
with:
cosign-release: 'v1.13.1'
cosign-release: 'v2.2.0'


# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
uses: docker/setup-buildx-action@v3

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -59,15 +59,15 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
uses: docker/build-push-action@v5
with:
context: "simplerisk"
file: "simplerisk/jammy/Dockerfile"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/simplerisk-jammy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4
- name: Build Docker container
uses: docker/build-push-action@v5
with:
context: ${{ env.CONTEXT_PATH }}
file: ${{ env.DOCKERFILE_PATH }}
tags: ${{ env.IMAGE_TAG }}
- name: Run linter with Dockle
uses: erzz/dockle-action@v1.4.0
uses: erzz/dockle-action@v1
with:
image: ${{ env.IMAGE_TAG }}
failure-threshold: FATAL
dockle-host: "unix:///var/run/docker.sock"
- name: Scan vulnerabilities with Grype
uses: anchore/scan-action@v3.3.6
uses: anchore/scan-action@v3
with:
image: ${{ env.IMAGE_TAG }}
only-fixed: true
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/simplerisk-minimal-php81-push_to_github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@f3c664df7af409cb4873aa5068053ba9d61a57b6 #v2.6.0
uses: sigstore/cosign-installer@v3
with:
cosign-release: 'v1.13.1'
cosign-release: 'v2.2.0'


# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
uses: docker/setup-buildx-action@v3

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
Expand All @@ -59,15 +59,15 @@ jobs:
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
uses: docker/build-push-action@v5
with:
context: "simplerisk-minimal"
file: "simplerisk-minimal/php81/Dockerfile"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/simplerisk-minimal-php81.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4.1.0
uses: actions/checkout@v4
- name: Build Docker container
uses: docker/build-push-action@v5
with:
context: ${{ env.CONTEXT_PATH }}
file: ${{ env.DOCKERFILE_PATH }}
tags: ${{ env.IMAGE_TAG }}
- name: Run linter with Dockle
uses: erzz/dockle-action@v1.4.0
uses: erzz/dockle-action@v1
with:
image: ${{ env.IMAGE_TAG }}
failure-threshold: FATAL
dockle-host: "unix:///var/run/docker.sock"
- name: Scan vulnerabilities with Grype
uses: anchore/scan-action@v3.3.6
uses: anchore/scan-action@v3
with:
image: ${{ env.IMAGE_TAG }}
only-fixed: true
Expand Down

0 comments on commit 4be1a10

Please sign in to comment.