Skip to content

Commit a2687b3

Browse files
leojonathanohleojonathanoh
authored
Merge pull request #35 from theohbrothers/enhancement/bump-2.8.0-variants-to-2.8.1
Enhancement: Bump `2.8.0` variants to `2.8.1`
2 parents d4c86ba + b316629 commit a2687b3

File tree

14 files changed

+342
-80
lines changed

14 files changed

+342
-80
lines changed

‎.github/workflows/ci-master-pr.yml

Lines changed: 58 additions & 58 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ Dockerized [`webhook`](https://github.com/adnanh/webhook) with useful tools.
1010

1111
| Tag | Dockerfile Build Context |
1212
|:-------:|:---------:|
13-
| `:2.8.0-alpine-3.17`, `:latest` | [View](variants/2.8.0-alpine-3.17) |
14-
| `:2.8.0-libvirt-8-alpine-3.17` | [View](variants/2.8.0-libvirt-8-alpine-3.17) |
15-
| `:2.8.0-curl-git-jq-sops-ssh-alpine-3.17` | [View](variants/2.8.0-curl-git-jq-sops-ssh-alpine-3.17) |
16-
| `:2.8.0-alpine-3.15` | [View](variants/2.8.0-alpine-3.15) |
17-
| `:2.8.0-libvirt-7-alpine-3.15` | [View](variants/2.8.0-libvirt-7-alpine-3.15) |
18-
| `:2.8.0-curl-git-jq-sops-ssh-alpine-3.15` | [View](variants/2.8.0-curl-git-jq-sops-ssh-alpine-3.15) |
19-
| `:2.8.0-alpine-3.13` | [View](variants/2.8.0-alpine-3.13) |
20-
| `:2.8.0-libvirt-6-alpine-3.13` | [View](variants/2.8.0-libvirt-6-alpine-3.13) |
21-
| `:2.8.0-curl-git-jq-sops-ssh-alpine-3.13` | [View](variants/2.8.0-curl-git-jq-sops-ssh-alpine-3.13) |
13+
| `:2.8.1-alpine-3.17`, `:latest` | [View](variants/2.8.1-alpine-3.17) |
14+
| `:2.8.1-libvirt-8-alpine-3.17` | [View](variants/2.8.1-libvirt-8-alpine-3.17) |
15+
| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.17` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.17) |
16+
| `:2.8.1-alpine-3.15` | [View](variants/2.8.1-alpine-3.15) |
17+
| `:2.8.1-libvirt-7-alpine-3.15` | [View](variants/2.8.1-libvirt-7-alpine-3.15) |
18+
| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.15` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.15) |
19+
| `:2.8.1-alpine-3.13` | [View](variants/2.8.1-alpine-3.13) |
20+
| `:2.8.1-libvirt-6-alpine-3.13` | [View](variants/2.8.1-libvirt-6-alpine-3.13) |
21+
| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.13` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.13) |
2222
| `:2.7.0-alpine-3.13` | [View](variants/2.7.0-alpine-3.13) |
2323
| `:2.7.0-curl-git-jq-sops-ssh-alpine-3.13` | [View](variants/2.7.0-curl-git-jq-sops-ssh-alpine-3.13) |
24-
| `:2.8.0-alpine-3.12` | [View](variants/2.8.0-alpine-3.12) |
25-
| `:2.8.0-curl-git-jq-sops-ssh-alpine-3.12` | [View](variants/2.8.0-curl-git-jq-sops-ssh-alpine-3.12) |
24+
| `:2.8.1-alpine-3.12` | [View](variants/2.8.1-alpine-3.12) |
25+
| `:2.8.1-curl-git-jq-sops-ssh-alpine-3.12` | [View](variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.12) |
2626
| `:2.7.0-alpine-3.12` | [View](variants/2.7.0-alpine-3.12) |
2727
| `:2.7.0-curl-git-jq-sops-ssh-alpine-3.12` | [View](variants/2.7.0-curl-git-jq-sops-ssh-alpine-3.12) |
2828

‎generate/definitions/VARIANTS.ps1

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
21
# Docker image variants' definitions
32
$local:VARIANTS_MATRIX = @(
43
@{
54
package = 'webhook'
6-
package_version = '2.8.0'
5+
package_version = '2.8.1'
76
distro = 'alpine'
87
distro_version = '3.17'
98
subvariants = @(
10-
@{ components = @(); tag_as_latest = $true }
9+
@{ components = @() }
1110
@{ components = @( 'libvirt-8' ) }
1211
@{ components = @( 'curl', 'git', 'jq', 'sops', 'ssh' ) }
1312
)
1413
}
1514
@{
1615
package = 'webhook'
17-
package_version = '2.8.0'
16+
package_version = '2.8.1'
1817
distro = 'alpine'
1918
distro_version = '3.15'
2019
subvariants = @(
@@ -25,7 +24,7 @@ $local:VARIANTS_MATRIX = @(
2524
}
2625
@{
2726
package = 'webhook'
28-
package_version = '2.8.0'
27+
package_version = '2.8.1'
2928
distro = 'alpine'
3029
distro_version = '3.13'
3130
subvariants = @(
@@ -46,7 +45,7 @@ $local:VARIANTS_MATRIX = @(
4645
}
4746
@{
4847
package = 'webhook'
49-
package_version = '2.8.0'
48+
package_version = '2.8.1'
5049
distro = 'alpine'
5150
distro_version = '3.12'
5251
subvariants = @(
@@ -92,11 +91,7 @@ $VARIANTS = @(
9291
$variant['distro']
9392
$variant['distro_version']
9493
) -join '-'
95-
tag_as_latest = if ( $subVariant.Contains('tag_as_latest') ) {
96-
$subVariant['tag_as_latest']
97-
} else {
98-
$false
99-
}
94+
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 }
10095
}
10196
}
10297
}

‎variants/2.8.1-alpine-3.12/Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM golang:1.20-alpine as builder
2+
ARG TARGETPLATFORM
3+
ARG BUILDPLATFORM
4+
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
5+
6+
RUN set -eux; \
7+
apk add --no-cache git; \
8+
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
9+
cd /src; \
10+
go build -ldflags="-s -w" -o /usr/local/bin/webhook;
11+
12+
FROM alpine:3.12
13+
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
14+
RUN webhook --version
15+
16+
RUN apk add --no-cache ca-certificates
17+
WORKDIR /config
18+
ENTRYPOINT [ "webhook" ]
19+
EXPOSE 9000
20+
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]

‎variants/2.8.1-alpine-3.13/Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM golang:1.20-alpine as builder
2+
ARG TARGETPLATFORM
3+
ARG BUILDPLATFORM
4+
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
5+
6+
RUN set -eux; \
7+
apk add --no-cache git; \
8+
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
9+
cd /src; \
10+
go build -ldflags="-s -w" -o /usr/local/bin/webhook;
11+
12+
FROM alpine:3.13
13+
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
14+
RUN webhook --version
15+
16+
RUN apk add --no-cache ca-certificates
17+
WORKDIR /config
18+
ENTRYPOINT [ "webhook" ]
19+
EXPOSE 9000
20+
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]

‎variants/2.8.1-alpine-3.15/Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM golang:1.20-alpine as builder
2+
ARG TARGETPLATFORM
3+
ARG BUILDPLATFORM
4+
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
5+
6+
RUN set -eux; \
7+
apk add --no-cache git; \
8+
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
9+
cd /src; \
10+
go build -ldflags="-s -w" -o /usr/local/bin/webhook;
11+
12+
FROM alpine:3.15
13+
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
14+
RUN webhook --version
15+
16+
RUN apk add --no-cache ca-certificates
17+
WORKDIR /config
18+
ENTRYPOINT [ "webhook" ]
19+
EXPOSE 9000
20+
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]

‎variants/2.8.1-alpine-3.17/Dockerfile

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
FROM golang:1.20-alpine as builder
2+
ARG TARGETPLATFORM
3+
ARG BUILDPLATFORM
4+
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
5+
6+
RUN set -eux; \
7+
apk add --no-cache git; \
8+
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
9+
cd /src; \
10+
go build -ldflags="-s -w" -o /usr/local/bin/webhook;
11+
12+
FROM alpine:3.17
13+
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
14+
RUN webhook --version
15+
16+
RUN apk add --no-cache ca-certificates
17+
WORKDIR /config
18+
ENTRYPOINT [ "webhook" ]
19+
EXPOSE 9000
20+
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]

‎variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.12/Dockerfile

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
FROM golang:1.20-alpine as builder
2+
ARG TARGETPLATFORM
3+
ARG BUILDPLATFORM
4+
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
5+
6+
RUN set -eux; \
7+
apk add --no-cache git; \
8+
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
9+
cd /src; \
10+
go build -ldflags="-s -w" -o /usr/local/bin/webhook;
11+
12+
FROM alpine:3.12
13+
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
14+
RUN webhook --version
15+
16+
RUN apk add --no-cache ca-certificates
17+
RUN apk add --no-cache curl
18+
RUN apk add --no-cache git
19+
RUN apk add --no-cache jq
20+
RUN set -eux; \
21+
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
22+
chmod +x /usr/local/bin/sops; \
23+
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
24+
sops --version
25+
26+
RUN apk add --no-cache gnupg
27+
RUN apk add --no-cache openssh-client
28+
WORKDIR /config
29+
ENTRYPOINT [ "webhook" ]
30+
EXPOSE 9000
31+
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]

‎variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.13/Dockerfile

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
FROM golang:1.20-alpine as builder
2+
ARG TARGETPLATFORM
3+
ARG BUILDPLATFORM
4+
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
5+
6+
RUN set -eux; \
7+
apk add --no-cache git; \
8+
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
9+
cd /src; \
10+
go build -ldflags="-s -w" -o /usr/local/bin/webhook;
11+
12+
FROM alpine:3.13
13+
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
14+
RUN webhook --version
15+
16+
RUN apk add --no-cache ca-certificates
17+
RUN apk add --no-cache curl
18+
RUN apk add --no-cache git
19+
RUN apk add --no-cache jq
20+
RUN set -eux; \
21+
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
22+
chmod +x /usr/local/bin/sops; \
23+
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
24+
sops --version
25+
26+
RUN apk add --no-cache gnupg
27+
RUN apk add --no-cache openssh-client
28+
WORKDIR /config
29+
ENTRYPOINT [ "webhook" ]
30+
EXPOSE 9000
31+
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]

‎variants/2.8.1-curl-git-jq-sops-ssh-alpine-3.15/Dockerfile

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
FROM golang:1.20-alpine as builder
2+
ARG TARGETPLATFORM
3+
ARG BUILDPLATFORM
4+
RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM"
5+
6+
RUN set -eux; \
7+
apk add --no-cache git; \
8+
git clone https://github.com/adnanh/webhook.git /src --branch 2.8.1; \
9+
cd /src; \
10+
go build -ldflags="-s -w" -o /usr/local/bin/webhook;
11+
12+
FROM alpine:3.15
13+
COPY --from=builder /usr/local/bin/webhook /usr/local/bin/webhook
14+
RUN webhook --version
15+
16+
RUN apk add --no-cache ca-certificates
17+
RUN apk add --no-cache curl
18+
RUN apk add --no-cache git
19+
RUN apk add --no-cache jq
20+
RUN set -eux; \
21+
wget -qO- https://github.com/mozilla/sops/releases/download/v3.7.1/sops-v3.7.1.linux > /usr/local/bin/sops; \
22+
chmod +x /usr/local/bin/sops; \
23+
sha256sum /usr/local/bin/sops | grep '^185348fd77fc160d5bdf3cd20ecbc796163504fd3df196d7cb29000773657b74 '; \
24+
sops --version
25+
26+
RUN apk add --no-cache gnupg
27+
RUN apk add --no-cache openssh-client
28+
WORKDIR /config
29+
ENTRYPOINT [ "webhook" ]
30+
EXPOSE 9000
31+
CMD [ "-verbose", "-hooks=/config/hooks.yml", "-hotreload" ]

0 commit comments

Comments
 (0)