Skip to content

Commit

Permalink
Update Alpine to 3.18.4 version
Browse files Browse the repository at this point in the history
  • Loading branch information
tyranron committed Oct 4, 2023
1 parent b95af2b commit 3f963e1
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ All user visible changes to this project will be documented in this file. This p



## [1.4.2-r27] · 2023-09-??
[1.4.2-r27]: /../../tree/1.4.2-r27
## [1.4.2-r28] · 2023-10-04
[1.4.2-r28]: /../../tree/1.4.2-r28

[Diff](/../../compare/1.4.2-r27...)
[Diff](/../../compare/1.4.2-r27...1.4.2-r28)

### Security updated

- [Alpine Linux] 3.18.4: <https://github.com/docker-library/official-images/commit/2f22914dcf488bd066771452d2c694ad4f7e88c4>
- [Debian Linux] "bookworm" 20230919: <https://github.com/docker-library/official-images/commit/8b469263a1fab3a17b9f520bcf8ef53f3c828e27>


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

<? if ($isAlpineImage) { ?>
# https://hub.docker.com/_/alpine
FROM alpine:3.18.3
FROM alpine:3.18.4
<? } else { ?>
# https://hub.docker.com/_/debian
FROM debian:bookworm-slim
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:1.4.2-r27,1.4.2,1.4,1,latest \
alpine:1.4.2-r27-alpine,1.4.2-alpine,1.4-alpine,1-alpine,alpine
debian:1.4.2-r28,1.4.2,1.4,1,latest \
alpine:1.4.2-r28-alpine,1.4.2-alpine,1.4-alpine,1-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 @@ OpenDMARC Docker image

## Supported tags and respective `Dockerfile` links

- [`1.4.2-r27`, `1.4.2`, `1.4`, `1`, `latest`][101]
- [`1.4.2-r27-alpine`, `1.4.2-alpine`, `1.4-alpine`, `1-alpine`, `alpine`][102]
- [`1.4.2-r28`, `1.4.2`, `1.4`, `1`, `latest`][101]
- [`1.4.2-r28-alpine`, `1.4.2-alpine`, `1.4-alpine`, `1-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 @@ -2,7 +2,7 @@
# DO NOT EDIT THIS FILE DIRECTLY, USE /Dockerfile.tmpl.php

# https://hub.docker.com/_/alpine
FROM alpine:3.18.3
FROM alpine:3.18.4

ARG s6_overlay_ver=3.1.5.0

Expand Down

0 comments on commit 3f963e1

Please sign in to comment.