Skip to content

Commit 7c3bf0f

Browse files
committed
Merge branch 'release/0.4.1'
2 parents b5a20d2 + 11965af commit 7c3bf0f

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
uses: docker/setup-qemu-action@v3
5454
-
5555
name: Build and push
56-
uses: docker/build-push-action@v5
56+
uses: docker/build-push-action@v6
5757
with:
5858
context: .
5959
file: ./Dockerfile

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [0.4.1] - 2024-07-31
9+
10+
### Fixed
11+
12+
- Resolved Docker build warning regarding cases of the `FROM x AS y` format
13+
814
## [0.4.0] - 2024-06-10
915

1016
### Changed
@@ -18,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1824

1925
### Fixed
2026

21-
- dependabot was target the wrong branch for updates
27+
- dependabot was targeting the wrong branch for updates
2228

2329
## [0.3.0]
2430

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Purpose: Installs s6-overlay and rootfs
33
# Comments:
44
# - Don't leave anything extra in here either
5-
FROM docker.io/alpine:3.20 as s6-overlay-base
5+
FROM docker.io/alpine:3.20 AS s6-overlay-base
66

77
WORKDIR /usr/src/s6
88

@@ -58,7 +58,7 @@ COPY ./rootfs /
5858
# Purpose: The final image
5959
# Comments:
6060
# - Don't leave anything extra in here
61-
FROM s6-overlay-base as main-app
61+
FROM s6-overlay-base AS main-app
6262

6363
RUN set -eux \
6464
&& echo "Installing dnsmasq" \

0 commit comments

Comments
 (0)