Skip to content

Commit

Permalink
Upgrade Alpine to 3.20 version
Browse files Browse the repository at this point in the history
  • Loading branch information
tyranron committed May 24, 2024
1 parent 1bfa524 commit f566cb7
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 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



## [1.4.2-r36] · 2024-??-?? (unreleased)
[1.4.2-r36]: /../../tree/1.4.2-r36
## [1.4.2-r37] · 2024-05-24
[1.4.2-r37]: /../../tree/1.4.2-r37

[Diff](/../../compare/1.4.2-r36...1.4.2-r37)

### Upgraded

[Diff](/../../compare/1.4.2-r36...)
- [Alpine Linux] 3.20: <https://alpinelinux.org/posts/Alpine-3.20.0-released.html>

### 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 @@ -7,7 +7,7 @@

<? if ($isAlpineImage) { ?>
# https://hub.docker.com/_/alpine
FROM alpine:3.19
FROM alpine:3.20
<? } 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-r36,1.4.2,1.4,1,latest \
alpine:1.4.2-r36-alpine,1.4.2-alpine,1.4-alpine,1-alpine,alpine
debian:1.4.2-r37,1.4.2,1.4,1,latest \
alpine:1.4.2-r37-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-r36`, `1.4.2`, `1.4`, `1`, `latest`][101]
- [`1.4.2-r36-alpine`, `1.4.2-alpine`, `1.4-alpine`, `1-alpine`, `alpine`][102]
- [`1.4.2-r37`, `1.4.2`, `1.4`, `1`, `latest`][101]
- [`1.4.2-r37-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.19
FROM alpine:3.20

ARG s6_overlay_ver=3.1.6.2

Expand Down

0 comments on commit f566cb7

Please sign in to comment.