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.19 #29

Merged
merged 2 commits into from
Dec 28, 2023
Merged

Rebase to Alpine 3.19 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6427d8
Rebase to Alpine 3.19
nemchik Dec 24, 2023
a76df41
Merge branch 'main' into 3.19
nemchik Dec 28, 2023
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
20 changes: 10 additions & 10 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-nginx:3.18
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19

# set version label
ARG BUILD_DATE
Expand All @@ -12,15 +12,15 @@ LABEL maintainer="gilbn"
RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
php82-ftp \
php82-gd \
php82-intl \
php82-ldap \
php82-mysqli \
php82-pdo_mysql \
php82-pdo_sqlite \
php82-sqlite3 \
php82-tokenizer && \
php83-ftp \
php83-gd \
php83-intl \
php83-ldap \
php83-mysqli \
php83-pdo_mysql \
php83-pdo_sqlite \
php83-sqlite3 \
php83-tokenizer && \
echo "**** install xbackbone ****" && \
mkdir -p /app/www/public && \
if [ -z ${XBACKBONE_RELEASE+x} ]; then \
Expand Down
20 changes: 10 additions & 10 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-nginx:arm64v8-3.18
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19

# set version label
ARG BUILD_DATE
Expand All @@ -12,15 +12,15 @@ LABEL maintainer="gilbn"
RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
php82-ftp \
php82-gd \
php82-intl \
php82-ldap \
php82-mysqli \
php82-pdo_mysql \
php82-pdo_sqlite \
php82-sqlite3 \
php82-tokenizer && \
php83-ftp \
php83-gd \
php83-intl \
php83-ldap \
php83-mysqli \
php83-pdo_mysql \
php83-pdo_sqlite \
php83-sqlite3 \
php83-tokenizer && \
echo "**** install xbackbone ****" && \
mkdir -p /app/www/public && \
if [ -z ${XBACKBONE_RELEASE+x} ]; then \
Expand Down
3 changes: 2 additions & 1 deletion readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ available_architectures:
param_container_name: "{{ project_name }}"
param_usage_include_vols: true
param_volumes:
- { vol_path: "/config", vol_host_path: "/path/to/data", desc: "config directory volume mapping" }
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
param_usage_include_env: true
param_env_vars:
- { env_var: "TZ", env_value: "Europe/Oslo", desc: "Timezone (i.e., Europe/Oslo)" }
Expand Down Expand Up @@ -45,6 +45,7 @@ app_setup_block: |

# changelog
changelogs:
- { date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
- { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
Expand Down