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 #51

Merged
merged 1 commit into from
Jun 6, 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
8 changes: 5 additions & 3 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.19 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
############## build stage ##############

# package version
Expand Down Expand Up @@ -87,7 +87,7 @@ RUN \
>> /tmp/znc/packages
############## 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 @@ -103,11 +103,13 @@ RUN \
echo "**** install runtime packages ****" && \
RUNTIME_PACKAGES=$(echo $(cat /packages)) && \
apk add -U --update --no-cache \
${RUNTIME_PACKAGES}
${RUNTIME_PACKAGES} && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version

# copy local files
COPY root/ /

# ports and volumes
EXPOSE 6501

VOLUME /config
8 changes: 5 additions & 3 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.19 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
############## build stage ##############

# package version
Expand Down Expand Up @@ -86,7 +86,7 @@ RUN \
>> /tmp/znc/packages
############## 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 @@ -102,11 +102,13 @@ RUN \
echo "**** install runtime packages ****" && \
RUNTIME_PACKAGES=$(echo $(cat /packages)) && \
apk add -U --update --no-cache \
${RUNTIME_PACKAGES}
${RUNTIME_PACKAGES} && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version

# copy local files
COPY root/ /

# ports and volumes
EXPOSE 6501

VOLUME /config
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ pipeline {
CI_PORT='6501'
CI_SSL='false'
CI_DELAY='30'
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 @@ -275,6 +275,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **06.06.24:** - Rebase to Alpine 3.20.
* **26.03.24:** - Switch back to multi-threaded builds and ignore `-beta` and `-alpha` tags as well as `-rc`.
* **22.02.24:** - Update build system for v1.9.0 (use cmake).
* **23.12.23:** - Rebase to Alpine 3.19.
Expand Down
4 changes: 2 additions & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ repo_vars:
- CI_PORT='6501'
- CI_SSL='false'
- CI_DELAY='30'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_AUTH='user:password'
- CI_DOCKERENV=''
- CI_AUTH=''
- CI_WEBPATH=''
17 changes: 2 additions & 15 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,16 @@ project_blurb_optional_extras_enabled: false
available_architectures:
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
# development version
development_versions: false

# container parameters
common_param_env_vars_enabled: true
param_container_name: "{{ project_name }}"
param_usage_include_net: false
param_usage_include_env: true
param_env_vars:
- {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."}
param_usage_include_vols: true
param_volumes:
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
param_usage_include_ports: true
param_ports:
- {external_port: "6501", internal_port: "6501", port_desc: "Port ZNC listens on."}
param_device_map: false
cap_add_param: false
# optional container parameters
opt_param_usage_include_env: false
opt_param_usage_include_vols: false
opt_param_usage_include_ports: false
opt_param_device_map: false
opt_cap_add_param: false
optional_block_1: false
# application setup block
app_setup_block_enabled: true
app_setup_block: |
Expand All @@ -45,6 +31,7 @@ app_setup_block: |
`change password ASAP.`
# changelog
changelogs:
- {date: "06.06.24:", desc: "Rebase to Alpine 3.20."}
- {date: "26.03.24:", desc: "Switch back to multi-threaded builds and ignore `-beta` and `-alpha` tags as well as `-rc`."}
- {date: "22.02.24:", desc: "Update build system for v1.9.0 (use cmake)."}
- {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
Expand Down