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.

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 3.20 #9

Merged
merged 1 commit into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions Dockerfile
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.18
FROM ghcr.io/linuxserver/baseimage-alpine:3.20

# set version label
ARG BUILD_DATE
Expand All @@ -10,17 +10,17 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer"

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
build-base \
npm && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
findutils \
git \
nodejs \
python3 \
sudo && \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
build-base \
npm && \
echo "**** install Pylon ****" && \
mkdir -p \
/app/pylon && \
Expand All @@ -39,6 +39,7 @@ RUN \
/app/pylon/.sessions && \
echo "**** install node modules ****" && \
npm install --prefix /app/pylon && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
Expand Down
13 changes: 7 additions & 6 deletions Dockerfile.aarch64
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.18
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20

# set version label
ARG BUILD_DATE
Expand All @@ -10,18 +10,18 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="thelamer"

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
build-base \
npm && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
findutils \
git \
nodejs \
python3 \
sudo && \
echo "**** install Pylon ****" && \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
build-base \
npm && \
echo "**** install Pylon ****" && \
mkdir -p \
/app/pylon && \
if [ -z ${PYLON_RELEASE+x} ]; then \
Expand All @@ -39,6 +39,7 @@ RUN \
/app/pylon/.sessions && \
echo "**** install node modules ****" && \
npm install --prefix /app/pylon && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ pipeline {
CI_PORT='3131'
CI_SSL='false'
CI_DELAY='120'
CI_DOCKERENV='TZ=US/Pacific'
CI_AUTH='user:password'
CI_DOCKERENV=''
CI_AUTH=''
CI_WEBPATH=''
}
stages {
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **26.08.24:** - Rebase to Alpine 3.20
* **12.07.23:** - Rebase to Alpine 3.18
* **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
* **13.02.23:** - Rebase to Alpine 3.17, migrate to s6v3.
Expand Down
4 changes: 2 additions & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ repo_vars:
- CI_PORT='3131'
- CI_SSL='false'
- CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_AUTH='user:password'
- CI_DOCKERENV=''
- CI_AUTH=''
- CI_WEBPATH=''
4 changes: 1 addition & 3 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ param_container_name: "{{ project_name }}"
param_usage_include_ports: true
param_ports:
- {external_port: "3131", internal_port: "3131", port_desc: "The port for the Pylon web interface"}
param_usage_include_env: true
param_env_vars:
- {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
# optional params
opt_param_usage_include_vols: true
opt_param_volumes:
Expand All @@ -34,6 +31,7 @@ app_setup_block: |
Access the webui at http://your-ip:3131, more information [here](https://github.com/pylonide/pylon).
# changelog
changelogs:
- {date: "26.08.24:", desc: "Rebase to Alpine 3.20"}
- {date: "12.07.23:", desc: "Rebase to Alpine 3.18"}
- {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
- {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}
Expand Down