Skip to content

Commit

Permalink
Merge branch 'release/0.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
stumpylog committed Jul 31, 2024
2 parents b5a20d2 + 11965af commit 7c3bf0f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: docker/setup-qemu-action@v3
-
name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: ./Dockerfile
Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.4.1] - 2024-07-31

### Fixed

- Resolved Docker build warning regarding cases of the `FROM x AS y` format

## [0.4.0] - 2024-06-10

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

### Fixed

- dependabot was target the wrong branch for updates
- dependabot was targeting the wrong branch for updates

## [0.3.0]

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Purpose: Installs s6-overlay and rootfs
# Comments:
# - Don't leave anything extra in here either
FROM docker.io/alpine:3.20 as s6-overlay-base
FROM docker.io/alpine:3.20 AS s6-overlay-base

WORKDIR /usr/src/s6

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

RUN set -eux \
&& echo "Installing dnsmasq" \
Expand Down

0 comments on commit 7c3bf0f

Please sign in to comment.