diff --git a/Dockerfile b/Dockerfile index c09bb7d..4c9a964 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage # build variables ARG PWNDROP_RELEASE @@ -34,7 +34,7 @@ echo "**** fetch source code ****" && \ cp -r ./www /app/pwndrop/admin ############## runtime stage ############## -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -46,6 +46,9 @@ LABEL maintainer="aptalca" # add pwndrop COPY --from=buildstage /app/pwndrop/ /app/pwndrop/ +RUN \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version + # add local files COPY /root / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a6d779d..babbfd8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage # build variables ARG PWNDROP_RELEASE @@ -34,7 +34,7 @@ RUN \ cp -r ./www /app/pwndrop/admin ############## runtime stage ############## -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -46,6 +46,9 @@ LABEL maintainer="aptalca" # add pwndrop COPY --from=buildstage /app/pwndrop/ /app/pwndrop/ +RUN \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version + # add local files COPY /root / diff --git a/README.md b/README.md index 677bf5d..d7f006a 100644 --- a/README.md +++ b/README.md @@ -274,6 +274,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.06.24:** - Rebase to Alpine 3.20. * **20.03.24:** - Rebase to Alpine 3.19. * **07.08.23:** - Rebase to Alpine 3.18. * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) diff --git a/readme-vars.yml b/readme-vars.yml index 9ea5938..a68bbf0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -12,9 +12,6 @@ available_architectures: - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} # development version development_versions: false -development_versions_items: - - {tag: "latest", desc: "Stable releases"} - - {tag: "development", desc: "Pre-releases from their GitHub"} # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" @@ -36,6 +33,7 @@ app_setup_block: | Access the web gui at `http://:8080/pwndrop` (replace `/pwndrop` with your `SECRET_PATH` if you set one). # changelog changelogs: + - {date: "04.06.24:", desc: "Rebase to Alpine 3.20."} - {date: "20.03.24:", desc: "Rebase to Alpine 3.19."} - {date: "07.08.23:", desc: "Rebase to Alpine 3.18."} - {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}