Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to alpine 3.20 #10

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Rebase to alpine 3.20 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 /

Expand Down
7 changes: 5 additions & 2 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 /

Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand All @@ -36,6 +33,7 @@ app_setup_block: |
Access the web gui at `http://<your-ip>: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)"}
Expand Down