Skip to content

Commit

Permalink
Merge pull request #35 from theohbrothers/enhancement/bump-2.8.0-vari…
Browse files Browse the repository at this point in the history
…ants-to-2.8.1

Enhancement: Bump `2.8.0` variants to `2.8.1`
  • Loading branch information
leojonathanoh authored Jun 30, 2023
2 parents d4c86ba + b316629 commit a2687b3
Show file tree
Hide file tree
Showing 14 changed files with 342 additions and 80 deletions.
116 changes: 58 additions & 58 deletions .github/workflows/ci-master-pr.yml

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ Dockerized [`webhook`](https://github.com/adnanh/webhook) with useful tools.

| Tag | Dockerfile Build Context |
|:-------:|:---------:|
| `:2.8.0-alpine-3.17`, `:latest` | [View](variants/2.8.0-alpine-3.17) |
| `:2.8.0-libvirt-8-alpine-3.17` | [View](variants/2.8.0-libvirt-8-alpine-3.17) |
| `:2.8.0-curl-git-jq-sops-ssh-alpine-3.17` | [View](variants/2.8.0-curl-git-jq-sops-ssh-alpine-3.17) |
| `:2.8.0-alpine-3.15` | [View](variants/2.8.0-alpine-3.15) |
| `:2.8.0-libvirt-7-alpine-3.15` | [View](variants/2.8.0-libvirt-7-alpine-3.15) |
| `:2.8.0-curl-git-jq-sops-ssh-alpine-3.15` | [View](variants/2.8.0-curl-git-jq-sops-ssh-alpine-3.15) |
| `:2.8.0-alpine-3.13` | [View](variants/2.8.0-alpine-3.13) |
| `:2.8.0-libvirt-6-alpine-3.13` | [View](variants/2.8.0-libvirt-6-alpine-3.13) |
| `:2.8.0-curl-git-jq-sops-ssh-alpine-3.13` | [View](variants/2.8.0-curl-git-jq-sops-ssh-alpine-3.13) |
| `:2.8.1-alpine-3.17`, `:latest` | [View](variants/2.8.1-alpine-3.17) |
| `:2.8.1-libvirt-8-alpine-3.17` | [View](variants/2.8.1-libvirt-8-alpine-3.17) |
| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.17` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.17) |
| `:2.8.1-alpine-3.15` | [View](variants/2.8.1-alpine-3.15) |
| `:2.8.1-libvirt-7-alpine-3.15` | [View](variants/2.8.1-libvirt-7-alpine-3.15) |
| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.15` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.15) |
| `:2.8.1-alpine-3.13` | [View](variants/2.8.1-alpine-3.13) |
| `:2.8.1-libvirt-6-alpine-3.13` | [View](variants/2.8.1-libvirt-6-alpine-3.13) |
| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.13` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.13) |
| `:2.7.0-alpine-3.13` | [View](variants/2.7.0-alpine-3.13) |
| `:2.7.0-curl-git-jq-sops-ssh-alpine-3.13` | [View](variants/2.7.0-curl-git-jq-sops-ssh-alpine-3.13) |
| `:2.8.0-alpine-3.12` | [View](variants/2.8.0-alpine-3.12) |
| `:2.8.0-curl-git-jq-sops-ssh-alpine-3.12` | [View](variants/2.8.0-curl-git-jq-sops-ssh-alpine-3.12) |
| `:2.8.1-alpine-3.12` | [View](variants/2.8.1-alpine-3.12) |
| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.12` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.12) |
| `:2.7.0-alpine-3.12` | [View](variants/2.7.0-alpine-3.12) |
| `:2.7.0-curl-git-jq-sops-ssh-alpine-3.12` | [View](variants/2.7.0-curl-git-jq-sops-ssh-alpine-3.12) |

Expand Down
17 changes: 6 additions & 11 deletions generate/definitions/VARIANTS.ps1
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@

# Docker image variants' definitions
$local:VARIANTS_MATRIX = @(
@{
package = 'webhook'
package_version = '2.8.0'
package_version = '2.8.1'
distro = 'alpine'
distro_version = '3.17'
subvariants = @(
@{ components = @(); tag_as_latest = $true }
@{ components = @() }
@{ components = @( 'libvirt-8' ) }
@{ components = @( 'curl', 'git', 'jq', 'sops', 'ssh' ) }
)
}
@{
package = 'webhook'
package_version = '2.8.0'
package_version = '2.8.1'
distro = 'alpine'
distro_version = '3.15'
subvariants = @(
Expand All @@ -25,7 +24,7 @@ $local:VARIANTS_MATRIX = @(
}
@{
package = 'webhook'
package_version = '2.8.0'
package_version = '2.8.1'
distro = 'alpine'
distro_version = '3.13'
subvariants = @(
Expand All @@ -46,7 +45,7 @@ $local:VARIANTS_MATRIX = @(
}
@{
package = 'webhook'
package_version = '2.8.0'
package_version = '2.8.1'
distro = 'alpine'
distro_version = '3.12'
subvariants = @(
Expand Down Expand Up @@ -92,11 +91,7 @@ $VARIANTS = @(
$variant['distro']
$variant['distro_version']
) -join '-'
tag_as_latest = if ( $subVariant.Contains('tag_as_latest') ) {
$subVariant['tag_as_latest']
} else {
$false
}
tag_as_latest = if ($variant['package_version'] -eq $local:VARIANTS_MATRIX[0]['package_version'] -and $variant['distro_version'] -eq $local:VARIANTS_MATRIX[0]['distro_version'] -and $subVariant['components'].Count -eq 0) { $true } else { $false }
}
}
}
Expand Down
20 changes: 20 additions & 0 deletions variants/2.8.1-alpine-3.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.12
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
20 changes: 20 additions & 0 deletions variants/2.8.1-alpine-3.13/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.13
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
20 changes: 20 additions & 0 deletions variants/2.8.1-alpine-3.15/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.15
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
20 changes: 20 additions & 0 deletions variants/2.8.1-alpine-3.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.17
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
31 changes: 31 additions & 0 deletions variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.12/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.12
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache curl
RUN apk add --no-cache git
RUN apk add --no-cache jq
RUN set -eux; \
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
chmod +x /usr/local/bin/sops; \
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
sops --version

RUN apk add --no-cache gnupg
RUN apk add --no-cache openssh-client
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
31 changes: 31 additions & 0 deletions variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.13/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.13
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache curl
RUN apk add --no-cache git
RUN apk add --no-cache jq
RUN set -eux; \
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
chmod +x /usr/local/bin/sops; \
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
sops --version

RUN apk add --no-cache gnupg
RUN apk add --no-cache openssh-client
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
31 changes: 31 additions & 0 deletions variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.15/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.15
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache curl
RUN apk add --no-cache git
RUN apk add --no-cache jq
RUN set -eux; \
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
chmod +x /usr/local/bin/sops; \
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
sops --version

RUN apk add --no-cache gnupg
RUN apk add --no-cache openssh-client
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
31 changes: 31 additions & 0 deletions variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.17
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache curl
RUN apk add --no-cache git
RUN apk add --no-cache jq
RUN set -eux; \
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
chmod +x /usr/local/bin/sops; \
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
sops --version

RUN apk add --no-cache gnupg
RUN apk add --no-cache openssh-client
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
21 changes: 21 additions & 0 deletions variants/2.8.1-libvirt-6-alpine-3.13/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.13
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache libvirt-client
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
21 changes: 21 additions & 0 deletions variants/2.8.1-libvirt-7-alpine-3.15/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.15
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache libvirt-client
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]
21 changes: 21 additions & 0 deletions variants/2.8.1-libvirt-8-alpine-3.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
FROM golang:1.20-alpine as builder
ARG TARGETPLATFORM
ARG BUILDPLATFORM
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"

RUN set -eux; \
apk add --no-cache git; \
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
cd /src; \
go build -ldflags="-s -w" -o /usr/local/bin/webhook;

FROM alpine:3.17
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
RUN webhook --version

RUN apk add --no-cache ca-certificates
RUN apk add --no-cache libvirt-client
WORKDIR /config
ENTRYPOINT [ "webhook" ]
EXPOSE 9000
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]

0 comments on commit a2687b3

Please sign in to comment.