Skip to content

Commit a0fd625

Browse files
authored
Merge pull request #16 from linuxserver/3.20
Rebase to 3.20
2 parents ad01f4d + 14ca07d commit a0fd625

5 files changed

Lines changed: 8 additions & 10 deletions

File tree

Dockerfile

Lines changed: 3 additions & 2 deletions
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.19 as buildstage
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
44

55
# set version label
66
ARG BUILD_DATE
@@ -44,7 +44,7 @@ RUN \
4444
rm -rf \
4545
/tmp/*
4646

47-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
47+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
4848

4949
ARG BUILD_DATE
5050
ARG VERSION
@@ -76,6 +76,7 @@ RUN \
7676
yarn --production --frozen-lockfile && \
7777
yarn cache clean && \
7878
npm install -g serve && \
79+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
7980
echo "**** cleanup ****" && \
8081
apk del --purge \
8182
build-dependencies && \

Dockerfile.aarch64

Lines changed: 3 additions & 2 deletions
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.19 as buildstage
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
44

55
# set version label
66
ARG BUILD_DATE
@@ -44,7 +44,7 @@ RUN \
4444
rm -rf \
4545
/tmp/*
4646

47-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
47+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
4848

4949
ARG BUILD_DATE
5050
ARG VERSION
@@ -76,6 +76,7 @@ RUN \
7676
yarn --production --frozen-lockfile && \
7777
yarn cache clean && \
7878
npm install -g serve && \
79+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
7980
echo "**** cleanup ****" && \
8081
apk del --purge \
8182
build-dependencies && \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
288288

289289
## Versions
290290

291+
* **24.05.24:** - Rebase to Alpine 3.20.
291292
* **02.03.24:** - Updates for changes in 1.8.0. Initial DB migration may take several minutes.
292293
* **24.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
293294
* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.

jenkins-vars.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ external_type: github_stable
66
release_type: stable
77
release_tag: latest
88
ls_branch: main
9-
build_armhf: false
109
repo_vars:
1110
- EXT_GIT_BRANCH = 'main'
1211
- EXT_USER = 'Yooooomi'

readme-vars.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ development_versions: false
1818

1919
# container parameters
2020
param_container_name: "{{ project_name }}"
21-
param_usage_include_vols: false
22-
23-
opt_param_usage_include_vols: false
2421

2522
param_usage_include_ports: true
2623
param_ports:
@@ -34,8 +31,6 @@ param_env_vars:
3431
- { env_var: "SPOTIFY_SECRET", env_value: "", desc: "Your Spotify application secret."}
3532
- { env_var: "CORS", env_value: "http://localhost:80,https://localhost:443", desc: "Allowed CORS sources, set to `all` to allow any source."}
3633
- { env_var: "MONGO_ENDPOINT", env_value: "mongodb://mongo:27017/your_spotify", desc: "Set mongodb endpoint address/port."}
37-
# optional env variables
38-
opt_param_usage_include_env: false
3934

4035
# application setup block
4136
app_setup_block_enabled: true
@@ -48,6 +43,7 @@ app_setup_block: |
4843
4944
# changelog
5045
changelogs:
46+
- { date: "24.05.24:", desc: "Rebase to Alpine 3.20." }
5147
- { date: "02.03.24:", desc: "Updates for changes in 1.8.0. Initial DB migration may take several minutes." }
5248
- { date: "24.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
5349
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}

0 commit comments

Comments
 (0)