Skip to content

Commit

Permalink
fix(ci): minor corrections from code review
Browse files Browse the repository at this point in the history
  • Loading branch information
sts committed Mar 21, 2023
1 parent e619181 commit e3e7b9d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/container-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker metadata - Main
id: meta1
id: meta-main
uses: docker/metadata-action@v4
with:
images: ghcr.io/${{ github.repository }}
Expand All @@ -77,12 +77,12 @@ jobs:
platforms: linux/amd64
file: Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta1.outputs.tags }}
labels: ${{ steps.meta1.outputs.labels }}
tags: ${{ steps.meta-main.outputs.tags }}
labels: ${{ steps.meta-main.outputs.labels }}


- name: Docker metadata - CRS4
id: meta4
id: meta-crs4
uses: docker/metadata-action@v4
with:
images: ghcr.io/${{ github.repository }}
Expand All @@ -107,5 +107,5 @@ jobs:
target: coreruleset
build-args: |
CORERULESET_VERSION=v4.0.0-rc1
tags: ${{ steps.meta4.outputs.tags }}
labels: ${{ steps.meta4.outputs.labels }}
tags: ${{ steps.meta-crs4.outputs.tags }}
labels: ${{ steps.meta-crs4.outputs.labels }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FROM alpine:3.17 AS main

ARG TARGETARCH

LABEL org.opencontainers.image.authors="OWASP Coraza Maintainers" \
LABEL org.opencontainers.image.authors="The OWASP Coraza contributors" \
org.opencontainers.image.description="OWASP Coraza WAF (Haproxy SPOA)" \
org.opencontainers.image.documentation="https://coraza.io/connectors/coraza-spoa/" \
org.opencontainers.image.licenses="Apache-2.0" \
Expand Down
2 changes: 2 additions & 0 deletions docker/coraza-spoa/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -e

# Allow users to run arbitrary commands within the container

if [ $# -gt 0 ] && [ "$1" = "${1#-}" ]; then
# First char isn't `-`, probably a `docker run -ti <cmd>`
# Just exec and exit
Expand Down

0 comments on commit e3e7b9d

Please sign in to comment.