Skip to content

Commit b32c585

Browse files
authored
Merge pull request #60 from linuxserver/3.18
Rebase to Alpine 3.18, deprecate armhf
2 parents 1d17283 + 3590136 commit b32c585

File tree

8 files changed

+66
-148
lines changed

8 files changed

+66
-148
lines changed

.github/ISSUE_TEMPLATE/issue.bug.yml

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ body:
5353
options:
5454
- x86-64
5555
- arm64
56-
- armhf
5756
validations:
5857
required: true
5958
- type: textarea

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
44

55
# set version label
66
ARG BUILD_DATE

Dockerfile.aarch64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
44

55
# set version label
66
ARG BUILD_DATE

Dockerfile.armhf

-18
This file was deleted.

Jenkinsfile

+60-125
Large diffs are not rendered by default.

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The architectures supported by this image are:
5656
| :----: | :----: | ---- |
5757
| x86-64 || amd64-\<version tag\> |
5858
| arm64 || arm64v8-\<version tag\> |
59-
| armhf | | arm32v7-\<version tag\> |
59+
| armhf | | |
6060

6161
## Application Setup
6262

@@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
231231

232232
## Versions
233233

234+
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
234235
* **02.03.23:** - Rework shell scripts and cron logic.
235236
* **13.02.23:** - Rebase to alpine 3.17.
236237
* **23.09.22:** - Rebase to alpine 3.16 and s6v3.

jenkins-vars.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ external_type: os
66
release_type: stable
77
release_tag: latest
88
ls_branch: master
9+
build_armhf: false
910
repo_vars:
1011
- BUILD_VERSION_ARG = 'DUCKDNS_VERSION'
1112
- LS_USER = 'linuxserver'

readme-vars.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
1111
available_architectures:
1212
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
1313
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
14-
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
1514

1615
# development version
1716
development_versions: false
@@ -64,6 +63,7 @@ app_setup_block: |
6463
6564
# changelog
6665
changelogs:
66+
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
6767
- { date: "02.03.23:", desc: "Rework shell scripts and cron logic." }
6868
- { date: "13.02.23:", desc: "Rebase to alpine 3.17." }
6969
- { date: "23.09.22:", desc: "Rebase to alpine 3.16 and s6v3." }

0 commit comments

Comments
 (0)