Skip to content

Commit

Permalink
Upgrade s6-overlay to 3.2.0.2 version
Browse files Browse the repository at this point in the history
  • Loading branch information
tyranron committed Oct 11, 2024
1 parent 81a45b8 commit b5c020b
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
10 changes: 7 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ All user visible changes to this project will be documented in this file. This p



## [2.11.0-Beta2-r17] · 2024-??-?? (unreleased)
[2.11.0-Beta2-r17]: /../../tree/2.11.0-Beta2-r17
## [2.11.0-Beta2-r18] · 2024-10-10
[2.11.0-Beta2-r18]: /../../tree/2.11.0-Beta2-r18

[Diff](/../../compare/2.11.0-Beta2-r17...2.11.0-Beta2-r18)

### Upgraded

[Diff](/../../compare/2.11.0-Beta2-r17...)
- [s6-overlay] 3.2.0.2: <https://github.com/just-containers/s6-overlay/releases/tag/v3.2.0.2>

### Security updated

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.tmpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<? } ?>

ARG opendkim_ver=<?= explode('-', $var['version'])[0].'-'.explode('-', $var['version'])[1]."\n"; ?>
ARG s6_overlay_ver=3.2.0.0
ARG s6_overlay_ver=3.2.0.2


# Build and install OpenDKIM
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ REGISTRIES := $(strip $(subst $(comma), ,\
$(shell grep -m1 'registry: \["' .github/workflows/ci.yml \
| cut -d':' -f2 | tr -d '"][')))
ALL_IMAGES := \
debian:2.11.0-Beta2-r17,2.11.0-Beta2,2.11,2,latest \
alpine:2.11.0-Beta2-r17-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine
debian:2.11.0-Beta2-r18,2.11.0-Beta2,2.11,2,latest \
alpine:2.11.0-Beta2-r18-alpine,2.11.0-Beta2-alpine,2.11-alpine,2-alpine,alpine
# <Dockerfile>:<version>,<tag1>,<tag2>,...

# Default is first image from ALL_IMAGES list.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ OpenDKIM Docker image

## Supported tags and respective `Dockerfile` links

- [`2.11.0-Beta2-r17`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101]
- [`2.11.0-Beta2-r17-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102]
- [`2.11.0-Beta2-r18`, `2.11.0-Beta2`, `2.11`, `2`, `latest`][101]
- [`2.11.0-Beta2-r18-alpine`, `2.11.0-Beta2-alpine`, `2.11-alpine`, `2-alpine`, `alpine`][102]



Expand Down
2 changes: 1 addition & 1 deletion alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM alpine:3.20

ARG opendkim_ver=2.11.0-Beta2
ARG s6_overlay_ver=3.2.0.0
ARG s6_overlay_ver=3.2.0.2


# Build and install OpenDKIM
Expand Down
2 changes: 1 addition & 1 deletion debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM debian:bookworm-slim

ARG opendkim_ver=2.11.0-Beta2
ARG s6_overlay_ver=3.2.0.0
ARG s6_overlay_ver=3.2.0.2


# Build and install OpenDKIM
Expand Down

0 comments on commit b5c020b

Please sign in to comment.