Skip to content

Commit 3b737aa

Browse files
authored
Merge pull request #277 from linuxserver/3.23-initial
2 parents fabe29a + 59d84c2 commit 3b737aa

10 files changed

Lines changed: 68 additions & 68 deletions

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
## Readme
2525

2626
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
27-
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-alpine/edit/3.22/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-alpine/edit/3.23/readme-vars.yml).
2828

2929
These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
3030
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
115115

116116
## Update the changelog
117117

118-
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-baseimage-alpine/tree/3.22/root), add an entry to the changelog
118+
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-baseimage-alpine/tree/3.23/root), add an entry to the changelog
119119

120120
```yml
121121
changelogs:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
------------------------------
2323

24-
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-alpine/blob/3.22/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
24+
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-alpine/blob/3.23/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

2626
------------------------------
2727

.github/workflows/external_trigger.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ permissions:
77
contents: read
88

99
jobs:
10-
external-trigger-3-22:
10+
external-trigger-3-23:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4.1.1
1414

1515
- name: External Trigger
16-
if: github.ref == 'refs/heads/3.22'
16+
if: github.ref == 'refs/heads/3.23'
1717
env:
1818
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1919
run: |
2020
printf "# External trigger for docker-baseimage-alpine\n\n" >> $GITHUB_STEP_SUMMARY
2121
echo "Type is \`os\`" >> $GITHUB_STEP_SUMMARY
2222
echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY
2323
exit 0
24-
if grep -q "^baseimage-alpine_3.22_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
24+
if grep -q "^baseimage-alpine_3.23_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2525
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
2626
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
2727
exit 0

.github/workflows/greetings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- uses: actions/first-interaction@v1
1616
with:
1717
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
18-
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-alpine/blob/3.22/.github/PULL_REQUEST_TEMPLATE.md)!'
18+
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-alpine/blob/3.23/.github/PULL_REQUEST_TEMPLATE.md)!'
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM alpine:3.21 AS rootfs-stage
3+
FROM alpine:3.22 AS rootfs-stage
44

55
ARG S6_OVERLAY_VERSION="3.2.1.0"
66
ARG ROOTFS=/root-out
7-
ARG REL=v3.22
7+
ARG REL=v3.23
88
ARG ARCH=x86_64
99
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
1010
ARG PACKAGES=alpine-baselayout,\

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM alpine:3.21 AS rootfs-stage
3+
FROM alpine:3.22 AS rootfs-stage
44

55
ARG S6_OVERLAY_VERSION="3.2.1.0"
66
ARG ROOTFS=/root-out
7-
ARG REL=v3.22
7+
ARG REL=v3.23
88
ARG ARCH=aarch64
99
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
1010
ARG PACKAGES=alpine-baselayout,\

Dockerfile.riscv64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM alpine:3.21 AS rootfs-stage
3+
FROM alpine:3.22 AS rootfs-stage
44

55
ARG S6_OVERLAY_VERSION="3.2.1.0"
66
ARG ROOTFS=/root-out
7-
ARG REL=v3.22
7+
ARG REL=v3.23
88
ARG ARCH=riscv64
99
ARG MIRROR=http://dl-cdn.alpinelinux.org/alpine
1010
ARG PACKAGES=alpine-baselayout,\

Jenkinsfile

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- DO NOT EDIT THIS FILE MANUALLY -->
2-
<!-- Please read https://github.com/linuxserver/docker-baseimage-alpine/blob/3.22/.github/CONTRIBUTING.md -->
2+
<!-- Please read https://github.com/linuxserver/docker-baseimage-alpine/blob/3.23/.github/CONTRIBUTING.md -->
33
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
44

55
## Contact information:-

jenkins-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
project_name: docker-baseimage-alpine
55
external_type: os
66
release_type: stable
7-
release_tag: "3.22"
8-
ls_branch: "3.22"
7+
release_tag: "3.23"
8+
ls_branch: "3.23"
99
build_riscv64: true
1010
repo_vars:
1111
- BUILD_VERSION_ARG = 'OS'

0 commit comments

Comments
 (0)