Skip to content

Commit a6f4215

Browse files
committed
Initial Resolute build using prerelease snapshots
1 parent caccd84 commit a6f4215

13 files changed

Lines changed: 106 additions & 109 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-ubuntu/edit/noble/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-ubuntu/edit/resolute/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-ubuntu/tree/noble/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-ubuntu/tree/resolute/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-ubuntu/blob/noble/.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-ubuntu/blob/resolute/.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-noble:
10+
external-trigger-resolute:
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/noble'
16+
if: github.ref == 'refs/heads/resolute'
1717
env:
1818
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1919
run: |
2020
printf "# External trigger for docker-baseimage-ubuntu\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-ubuntu_noble_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
24+
if grep -q "^baseimage-ubuntu_resolute_${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-ubuntu/blob/noble/.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-ubuntu/blob/resolute/.github/PULL_REQUEST_TEMPLATE.md)!'
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
FROM alpine:3 AS rootfs-stage
44

55
# environment
6-
ENV REL=noble
76
ENV ARCH=amd64
8-
ENV TAG=oci-noble-24.04
7+
ENV TAG=oci-resolute-26.04
98

109
# install packages
1110
RUN \
@@ -40,7 +39,7 @@ RUN \
4039
/build
4140

4241
# set version for s6 overlay
43-
ARG S6_OVERLAY_VERSION="3.2.1.0"
42+
ARG S6_OVERLAY_VERSION="3.2.2.0"
4443
ARG S6_OVERLAY_ARCH="x86_64"
4544

4645
# add s6 overlay

Dockerfile.aarch64

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
FROM alpine:3 AS rootfs-stage
44

55
# environment
6-
ENV REL=noble
76
ENV ARCH=arm64
8-
ENV TAG=oci-noble-24.04
7+
ENV TAG=oci-resolute-26.04
98

109
# install packages
1110
RUN \
@@ -40,7 +39,7 @@ RUN \
4039
/build
4140

4241
# set version for s6 overlay
43-
ARG S6_OVERLAY_VERSION="3.2.1.0"
42+
ARG S6_OVERLAY_VERSION="3.2.2.0"
4443
ARG S6_OVERLAY_ARCH="aarch64"
4544

4645
# add s6 overlay

Dockerfile.riscv64

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
FROM alpine:3 AS rootfs-stage
44

55
# environment
6-
ENV REL=noble
76
ENV ARCH=riscv64
8-
ENV TAG=oci-noble-24.04
7+
ENV TAG=oci-resolute-26.04
98

109
# install packages
1110
RUN \
@@ -40,7 +39,7 @@ RUN \
4039
/build
4140

4241
# set version for s6 overlay
43-
ARG S6_OVERLAY_VERSION="3.2.1.0"
42+
ARG S6_OVERLAY_VERSION="3.2.2.0"
4443
ARG S6_OVERLAY_ARCH="riscv64"
4544

4645
# add s6 overlay

0 commit comments

Comments
 (0)