Merge remote-tracking branch 'origin/main' into develop

stumpylog · Dec 11, 2023 · f1737e3 · f1737e3
2 parents f9007ac + 747ba9e
commit f1737e3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,15 +9,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Changelog format is now "Keep a Changelog" style
 - s6-overlay 3.1.6.2
+- Alpine 3.19
+
+## [0.2.2] - 2023-11-01
+
+### Changed
+
+- Changelog format is now "Keep a Changelog" style
+- Updated action versions
 
-## [v0.2.0] - 2023-05-25
+## [0.2.0] - 2023-05-25
 
 - Alpine 3.18
 - s6-overlay 3.1.5.0
 
-## v0.1.0
+## [0.1.0]
 
 - Initial image release
 - Alpine 3.17

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM docker.io/alpine:3.18 as s6-overlay-base
+FROM docker.io/alpine:3.19 as s6-overlay-base
 
 WORKDIR /usr/src/s6