Skip to content

Commit 9d450c6

Browse files
leojonathanohleojonathanoh
authored
Merge pull request #69 from leojonathanoh/enhancement/bump-openvpn-2.5.8-variants-to-2.5.10-openvpn-2.6.8-variants-to-2.6.11-and-openvpn-2.6.11-variants-to-2.6.12
Enhancement: Bump openvpn 2.5.8 variants to 2.5.10, openvpn 2.6.8 variants to 2.6.11, and openvpn 2.6.11 variants to 2.6.12
2 parents 23a9260 + 8a1ccc3 commit 9d450c6

File tree

21 files changed

+2098
-70
lines changed

21 files changed

+2098
-70
lines changed

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

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
git diff --exit-code
3535
36-
build-2-6-10:
36+
build-2-6-12:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: Checkout
@@ -64,9 +64,9 @@ jobs:
6464
uses: actions/cache@v4
6565
with:
6666
path: /tmp/.buildx-cache
67-
key: ${{ runner.os }}-buildx-2.6.10-${{ github.sha }}
67+
key: ${{ runner.os }}-buildx-2.6.12-${{ github.sha }}
6868
restore-keys: |
69-
${{ runner.os }}-buildx-2.6.10-
69+
${{ runner.os }}-buildx-2.6.12-
7070
${{ runner.os }}-buildx-
7171
7272
- name: Login to Docker Hub registry
@@ -79,7 +79,7 @@ jobs:
7979

8080
# This step generates the docker tags
8181
- name: Prepare
82-
id: prep-2-6-10-alpine-edge
82+
id: prep-2-6-12-alpine-edge
8383
run: |
8484
set -e
8585
@@ -92,7 +92,7 @@ jobs:
9292
# Generate docker image tags
9393
# E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
9494
# E.g. 'master-<variant>' and 'master-abc0123-<variant>'
95-
VARIANT="2.6.10-alpine-edge"
95+
VARIANT="2.6.12-alpine-edge"
9696
REF_VARIANT="${REF}-${VARIANT}"
9797
REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
9898
@@ -102,45 +102,45 @@ jobs:
102102
echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
103103
echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
104104
105-
- name: 2.6.10-alpine-edge - Build (PRs)
105+
- name: 2.6.12-alpine-edge - Build (PRs)
106106
# Run only on pull requests
107107
if: github.event_name == 'pull_request'
108108
uses: docker/build-push-action@v5
109109
with:
110-
context: variants/2.6.10-alpine-edge
110+
context: variants/2.6.12-alpine-edge
111111
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
112112
push: false
113113
tags: |
114-
${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_VARIANT }}
115-
${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_SHA_VARIANT }}
114+
${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_VARIANT }}
115+
${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_SHA_VARIANT }}
116116
cache-from: type=local,src=/tmp/.buildx-cache
117117
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
118118

119-
- name: 2.6.10-alpine-edge - Build and push (master)
119+
- name: 2.6.12-alpine-edge - Build and push (master)
120120
# Run only on master
121121
if: github.ref == 'refs/heads/master'
122122
uses: docker/build-push-action@v5
123123
with:
124-
context: variants/2.6.10-alpine-edge
124+
context: variants/2.6.12-alpine-edge
125125
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
126126
push: true
127127
tags: |
128-
${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_VARIANT }}
129-
${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_SHA_VARIANT }}
128+
${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_VARIANT }}
129+
${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_SHA_VARIANT }}
130130
cache-from: type=local,src=/tmp/.buildx-cache
131131
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
132132

133-
- name: 2.6.10-alpine-edge - Build and push (release)
133+
- name: 2.6.12-alpine-edge - Build and push (release)
134134
if: startsWith(github.ref, 'refs/tags/')
135135
uses: docker/build-push-action@v5
136136
with:
137-
context: variants/2.6.10-alpine-edge
137+
context: variants/2.6.12-alpine-edge
138138
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
139139
push: true
140140
tags: |
141-
${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.VARIANT }}
142-
${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_VARIANT }}
143-
${{ github.repository }}:${{ steps.prep-2-6-10-alpine-edge.outputs.REF_SHA_VARIANT }}
141+
${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.VARIANT }}
142+
${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_VARIANT }}
143+
${{ github.repository }}:${{ steps.prep-2-6-12-alpine-edge.outputs.REF_SHA_VARIANT }}
144144
${{ github.repository }}:latest
145145
cache-from: type=local,src=/tmp/.buildx-cache
146146
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
@@ -153,7 +153,7 @@ jobs:
153153
rm -rf /tmp/.buildx-cache
154154
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
155155
156-
build-2-6-8:
156+
build-2-6-11:
157157
runs-on: ubuntu-latest
158158
steps:
159159
- name: Checkout
@@ -184,9 +184,9 @@ jobs:
184184
uses: actions/cache@v4
185185
with:
186186
path: /tmp/.buildx-cache
187-
key: ${{ runner.os }}-buildx-2.6.8-${{ github.sha }}
187+
key: ${{ runner.os }}-buildx-2.6.11-${{ github.sha }}
188188
restore-keys: |
189-
${{ runner.os }}-buildx-2.6.8-
189+
${{ runner.os }}-buildx-2.6.11-
190190
${{ runner.os }}-buildx-
191191
192192
- name: Login to Docker Hub registry
@@ -199,7 +199,7 @@ jobs:
199199

200200
# This step generates the docker tags
201201
- name: Prepare
202-
id: prep-2-6-8-alpine-3-18
202+
id: prep-2-6-11-alpine-3-18
203203
run: |
204204
set -e
205205
@@ -212,7 +212,7 @@ jobs:
212212
# Generate docker image tags
213213
# E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
214214
# E.g. 'master-<variant>' and 'master-abc0123-<variant>'
215-
VARIANT="2.6.8-alpine-3.18"
215+
VARIANT="2.6.11-alpine-3.18"
216216
REF_VARIANT="${REF}-${VARIANT}"
217217
REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
218218
@@ -222,45 +222,45 @@ jobs:
222222
echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
223223
echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
224224
225-
- name: 2.6.8-alpine-3.18 - Build (PRs)
225+
- name: 2.6.11-alpine-3.18 - Build (PRs)
226226
# Run only on pull requests
227227
if: github.event_name == 'pull_request'
228228
uses: docker/build-push-action@v5
229229
with:
230-
context: variants/2.6.8-alpine-3.18
230+
context: variants/2.6.11-alpine-3.18
231231
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
232232
push: false
233233
tags: |
234-
${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_VARIANT }}
235-
${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_SHA_VARIANT }}
234+
${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_VARIANT }}
235+
${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_SHA_VARIANT }}
236236
cache-from: type=local,src=/tmp/.buildx-cache
237237
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
238238

239-
- name: 2.6.8-alpine-3.18 - Build and push (master)
239+
- name: 2.6.11-alpine-3.18 - Build and push (master)
240240
# Run only on master
241241
if: github.ref == 'refs/heads/master'
242242
uses: docker/build-push-action@v5
243243
with:
244-
context: variants/2.6.8-alpine-3.18
244+
context: variants/2.6.11-alpine-3.18
245245
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
246246
push: true
247247
tags: |
248-
${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_VARIANT }}
249-
${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_SHA_VARIANT }}
248+
${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_VARIANT }}
249+
${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_SHA_VARIANT }}
250250
cache-from: type=local,src=/tmp/.buildx-cache
251251
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
252252

253-
- name: 2.6.8-alpine-3.18 - Build and push (release)
253+
- name: 2.6.11-alpine-3.18 - Build and push (release)
254254
if: startsWith(github.ref, 'refs/tags/')
255255
uses: docker/build-push-action@v5
256256
with:
257-
context: variants/2.6.8-alpine-3.18
257+
context: variants/2.6.11-alpine-3.18
258258
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
259259
push: true
260260
tags: |
261-
${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.VARIANT }}
262-
${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_VARIANT }}
263-
${{ github.repository }}:${{ steps.prep-2-6-8-alpine-3-18.outputs.REF_SHA_VARIANT }}
261+
${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.VARIANT }}
262+
${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_VARIANT }}
263+
${{ github.repository }}:${{ steps.prep-2-6-11-alpine-3-18.outputs.REF_SHA_VARIANT }}
264264
cache-from: type=local,src=/tmp/.buildx-cache
265265
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
266266

@@ -272,7 +272,7 @@ jobs:
272272
rm -rf /tmp/.buildx-cache
273273
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
274274
275-
build-2-5-8:
275+
build-2-5-10:
276276
runs-on: ubuntu-latest
277277
steps:
278278
- name: Checkout
@@ -303,9 +303,9 @@ jobs:
303303
uses: actions/cache@v4
304304
with:
305305
path: /tmp/.buildx-cache
306-
key: ${{ runner.os }}-buildx-2.5.8-${{ github.sha }}
306+
key: ${{ runner.os }}-buildx-2.5.10-${{ github.sha }}
307307
restore-keys: |
308-
${{ runner.os }}-buildx-2.5.8-
308+
${{ runner.os }}-buildx-2.5.10-
309309
${{ runner.os }}-buildx-
310310
311311
- name: Login to Docker Hub registry
@@ -318,7 +318,7 @@ jobs:
318318

319319
# This step generates the docker tags
320320
- name: Prepare
321-
id: prep-2-5-8-alpine-3-17
321+
id: prep-2-5-10-alpine-3-17
322322
run: |
323323
set -e
324324
@@ -331,7 +331,7 @@ jobs:
331331
# Generate docker image tags
332332
# E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
333333
# E.g. 'master-<variant>' and 'master-abc0123-<variant>'
334-
VARIANT="2.5.8-alpine-3.17"
334+
VARIANT="2.5.10-alpine-3.17"
335335
REF_VARIANT="${REF}-${VARIANT}"
336336
REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
337337
@@ -341,45 +341,45 @@ jobs:
341341
echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
342342
echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
343343
344-
- name: 2.5.8-alpine-3.17 - Build (PRs)
344+
- name: 2.5.10-alpine-3.17 - Build (PRs)
345345
# Run only on pull requests
346346
if: github.event_name == 'pull_request'
347347
uses: docker/build-push-action@v5
348348
with:
349-
context: variants/2.5.8-alpine-3.17
349+
context: variants/2.5.10-alpine-3.17
350350
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
351351
push: false
352352
tags: |
353-
${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_VARIANT }}
354-
${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_SHA_VARIANT }}
353+
${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_VARIANT }}
354+
${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_SHA_VARIANT }}
355355
cache-from: type=local,src=/tmp/.buildx-cache
356356
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
357357

358-
- name: 2.5.8-alpine-3.17 - Build and push (master)
358+
- name: 2.5.10-alpine-3.17 - Build and push (master)
359359
# Run only on master
360360
if: github.ref == 'refs/heads/master'
361361
uses: docker/build-push-action@v5
362362
with:
363-
context: variants/2.5.8-alpine-3.17
363+
context: variants/2.5.10-alpine-3.17
364364
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
365365
push: true
366366
tags: |
367-
${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_VARIANT }}
368-
${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_SHA_VARIANT }}
367+
${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_VARIANT }}
368+
${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_SHA_VARIANT }}
369369
cache-from: type=local,src=/tmp/.buildx-cache
370370
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
371371

372-
- name: 2.5.8-alpine-3.17 - Build and push (release)
372+
- name: 2.5.10-alpine-3.17 - Build and push (release)
373373
if: startsWith(github.ref, 'refs/tags/')
374374
uses: docker/build-push-action@v5
375375
with:
376-
context: variants/2.5.8-alpine-3.17
376+
context: variants/2.5.10-alpine-3.17
377377
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
378378
push: true
379379
tags: |
380-
${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.VARIANT }}
381-
${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_VARIANT }}
382-
${{ github.repository }}:${{ steps.prep-2-5-8-alpine-3-17.outputs.REF_SHA_VARIANT }}
380+
${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.VARIANT }}
381+
${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_VARIANT }}
382+
${{ github.repository }}:${{ steps.prep-2-5-10-alpine-3-17.outputs.REF_SHA_VARIANT }}
383383
cache-from: type=local,src=/tmp/.buildx-cache
384384
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
385385

@@ -1323,9 +1323,9 @@ jobs:
13231323
13241324
update-draft-release:
13251325
needs:
1326-
- build-2-6-10
1327-
- build-2-6-8
1328-
- build-2-5-8
1326+
- build-2-6-12
1327+
- build-2-6-11
1328+
- build-2-5-10
13291329
- build-2-4-12
13301330
- build-2-4-11
13311331
- build-2-4-6
@@ -1344,9 +1344,9 @@ jobs:
13441344

13451345
publish-draft-release:
13461346
needs:
1347-
- build-2-6-10
1348-
- build-2-6-8
1349-
- build-2-5-8
1347+
- build-2-6-12
1348+
- build-2-6-11
1349+
- build-2-5-10
13501350
- build-2-4-12
13511351
- build-2-4-11
13521352
- build-2-4-6
@@ -1367,9 +1367,9 @@ jobs:
13671367

13681368
update-dockerhub-description:
13691369
needs:
1370-
- build-2-6-10
1371-
- build-2-6-8
1372-
- build-2-5-8
1370+
- build-2-6-12
1371+
- build-2-6-11
1372+
- build-2-5-10
13731373
- build-2-4-12
13741374
- build-2-4-11
13751375
- build-2-4-6

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Dockerized `openvpn`.
1212

1313
| Tag | Dockerfile Build Context |
1414
|:-------:|:---------:|
15-
| `:2.6.10-alpine-edge`, `:latest` | [View](variants/2.6.10-alpine-edge) |
16-
| `:2.6.8-alpine-3.18` | [View](variants/2.6.8-alpine-3.18) |
17-
| `:2.5.8-alpine-3.17` | [View](variants/2.5.8-alpine-3.17) |
15+
| `:2.6.12-alpine-edge`, `:latest` | [View](variants/2.6.12-alpine-edge) |
16+
| `:2.6.11-alpine-3.18` | [View](variants/2.6.11-alpine-3.18) |
17+
| `:2.5.10-alpine-3.17` | [View](variants/2.5.10-alpine-3.17) |
1818
| `:2.4.12-alpine-3.12` | [View](variants/2.4.12-alpine-3.12) |
1919
| `:2.4.11-alpine-3.11` | [View](variants/2.4.11-alpine-3.11) |
2020
| `:2.4.11-alpine-3.10` | [View](variants/2.4.11-alpine-3.10) |
@@ -38,7 +38,7 @@ It is assumed that you have knowledge of configuring `openvpn`. If needed, refer
3838
To run the image, at the least you should mount a `/etc/openvpn/server.conf`, which may be a unified openvpn profile (see INLINE FILE SUPPORT section in the [openvpn manual](https://community.openvpn.net/openvpn/wiki/Openvpn24ManPage)).
3939

4040
```sh
41-
docker run --rm -it --cap-add NET_ADMIN -v /path/to/server.conf:/etc/openvpn/server.conf theohbrothers/docker-openvpn:2.6.10-alpine-edge
41+
docker run --rm -it --cap-add NET_ADMIN -v /path/to/server.conf:/etc/openvpn/server.conf theohbrothers/docker-openvpn:2.6.12-alpine-edge
4242
```
4343

4444
## Environment variables

‎generate/definitions/VARIANTS.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
$local:VARIANTS_MATRIX = @(
33
@{
44
package = 'openvpn'
5-
package_version = '2.6.10'
5+
package_version = '2.6.12'
66
distro = 'alpine'
77
distro_version = 'edge'
88
subvariants = @(
@@ -11,7 +11,7 @@ $local:VARIANTS_MATRIX = @(
1111
}
1212
@{
1313
package = 'openvpn'
14-
package_version = '2.6.8'
14+
package_version = '2.6.11'
1515
distro = 'alpine'
1616
distro_version = '3.18'
1717
subvariants = @(
@@ -20,7 +20,7 @@ $local:VARIANTS_MATRIX = @(
2020
}
2121
@{
2222
package = 'openvpn'
23-
package_version = '2.5.8'
23+
package_version = '2.5.10'
2424
distro = 'alpine'
2525
distro_version = '3.17'
2626
subvariants = @(

‎variants/2.5.10-alpine-3.17/Dockerfile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM alpine:3.17
2+
3+
RUN set -eux; \
4+
apk add --no-cache openvpn~=2.5.10 iptables; \
5+
# Workaround openvpn --version exiting with non-zero exit code on openvpn <= 2.4.x
6+
openvpn --version | grep -A100 -B100 2.5.10
7+
8+
COPY docker-entrypoint.sh /docker-entrypoint.sh
9+
RUN chmod +x /docker-entrypoint.sh
10+
11+
ENTRYPOINT ["/docker-entrypoint.sh"]

0 commit comments

Comments
 (0)