Skip to content

Commit

Permalink
Use standard nginx.conf from lsio alpine nginx base image
Browse files Browse the repository at this point in the history
  • Loading branch information
nemchik committed Aug 20, 2022
1 parent 64e86af commit 8960193
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 110 deletions.
33 changes: 14 additions & 19 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15

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

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
composer && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
php7 \
php7-sqlite3 \
php7-mysqli \
php7-pdo_mysql \
php7-pdo_sqlite \
php7-gd \
php7-json \
php7-fileinfo \
php7-zip \
php7-ftp \
php7-ldap \
php7-tokenizer \
php7-intl && \
php8 \
php8-sqlite3 \
php8-mysqli \
php8-pdo_mysql \
php8-pdo_sqlite \
php8-gd \
php8-json \
php8-fileinfo \
php8-zip \
php8-ftp \
php8-ldap \
php8-tokenizer \
php8-intl && \
echo "**** install xbackbone ****" && \
mkdir -p /app/xbackbone && \
if [ -z ${XBACKBONE_RELEASE+x} ]; then \
Expand All @@ -38,8 +35,6 @@ RUN \
"https://github.com/SergiX44/XBackBone/releases/download/${XBACKBONE_RELEASE}/release-v${XBACKBONE_RELEASE}.zip" && \
unzip -q -o /tmp/xbackbone.zip -d /app/xbackbone/ && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
Expand Down
33 changes: 14 additions & 19 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15

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

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
composer && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
php7 \
php7-sqlite3 \
php7-mysqli \
php7-pdo_mysql \
php7-pdo_sqlite \
php7-gd \
php7-json \
php7-fileinfo \
php7-zip \
php7-ftp \
php7-ldap \
php7-tokenizer \
php7-intl && \
php8 \
php8-sqlite3 \
php8-mysqli \
php8-pdo_mysql \
php8-pdo_sqlite \
php8-gd \
php8-json \
php8-fileinfo \
php8-zip \
php8-ftp \
php8-ldap \
php8-tokenizer \
php8-intl && \
echo "**** install xbackbone ****" && \
mkdir -p /app/xbackbone && \
if [ -z ${XBACKBONE_RELEASE+x} ]; then \
Expand All @@ -38,8 +35,6 @@ RUN \
"https://github.com/SergiX44/XBackBone/releases/download/${XBACKBONE_RELEASE}/release-v${XBACKBONE_RELEASE}.zip" && \
unzip -q -o /tmp/xbackbone.zip -d /app/xbackbone/ && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
Expand Down
33 changes: 14 additions & 19 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15

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

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
composer && \
echo "**** install runtime packages ****" && \
apk add --no-cache \
curl \
php7 \
php7-sqlite3 \
php7-mysqli \
php7-pdo_mysql \
php7-pdo_sqlite \
php7-gd \
php7-json \
php7-fileinfo \
php7-zip \
php7-ftp \
php7-ldap \
php7-tokenizer \
php7-intl && \
php8 \
php8-sqlite3 \
php8-mysqli \
php8-pdo_mysql \
php8-pdo_sqlite \
php8-gd \
php8-json \
php8-fileinfo \
php8-zip \
php8-ftp \
php8-ldap \
php8-tokenizer \
php8-intl && \
echo "**** install xbackbone ****" && \
mkdir -p /app/xbackbone && \
if [ -z ${XBACKBONE_RELEASE+x} ]; then \
Expand All @@ -38,8 +35,6 @@ RUN \
"https://github.com/SergiX44/XBackBone/releases/download/${XBACKBONE_RELEASE}/release-v${XBACKBONE_RELEASE}.zip" && \
unzip -q -o /tmp/xbackbone.zip -d /app/xbackbone/ && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,5 +238,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **02.08.2022:** - Added note about updating.
* **06.06.2021:** - Initial Release.
* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
* **02.08.22:** - Added note about updating.
* **06.06.21:** - Initial Release.
14 changes: 7 additions & 7 deletions package_versions.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
alpine-baselayout-3.2.0-r8
alpine-keys-2.4-r0
apache2-utils-2.4.54-r0
apache2-utils-2.4.51-r0
apk-tools-2.12.7-r0
apr-1.7.0-r1
apr-util-1.6.1-r7
argon2-libs-20190702-r1
bash-5.1.16-r0
brotli-libs-1.0.9-r3
busybox-1.32.1-r9
ca-certificates-20220614-r0
ca-certificates-bundle-20220614-r0
busybox-1.32.1-r7
ca-certificates-20191127-r5
ca-certificates-bundle-20191127-r5
coreutils-8.32-r2
curl-7.79.1-r2
expat-2.2.10-r6
Expand Down Expand Up @@ -63,7 +63,7 @@ nginx-1.18.0-r15
oniguruma-6.9.6-r0
openssl-1.1.1q-r0
pcre-8.44-r0
pcre2-10.36-r1
pcre2-10.36-r0
php7-7.4.26-r0
php7-common-7.4.26-r0
php7-fileinfo-7.4.26-r0
Expand Down Expand Up @@ -95,8 +95,8 @@ scanelf-1.2.8-r0
shadow-4.8.1-r0
skalibs-2.10.0.0-r0
sqlite-libs-3.34.1-r0
ssl_client-1.32.1-r9
tzdata-2022a-r0
ssl_client-1.32.1-r7
tzdata-2021e-r0
utmps-0.1.0.0-r0
xz-5.2.5-r1
xz-libs-5.2.5-r1
Expand Down
5 changes: 3 additions & 2 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@ app_setup_block: |
# changelog
changelogs:
- { date: "02.08.2022:", desc: "Added note about updating." }
- { date: "06.06.2021:", desc: "Initial Release." }
- { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
- { date: "02.08.22:", desc: "Added note about updating." }
- { date: "06.06.21:", desc: "Initial Release." }
41 changes: 0 additions & 41 deletions root/defaults/default

This file was deleted.

47 changes: 47 additions & 0 deletions root/defaults/nginx/site-confs/default.conf.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-xbackbone/commits/main/root/defaults/nginx/site-confs/default.conf.sample

server {
listen 80 default_server;
listen [::]:80 default_server;

listen 443 ssl http2;
listen [::]:443 ssl http2;

server_name _;

root /config/www/xbackbone;
index index.html index.htm index.php;

charset utf-8;
error_page 404 /index.php;
client_max_body_size 2G;

location / {
# enable for basic auth
#auth_basic "Restricted";
#auth_basic_user_file /config/nginx/.htpasswd;

try_files $uri $uri/ /index.html /index.php?$args =404;
}

location ~ ^(.+\.php)(.*)$ {
fastcgi_split_path_info ^(.+\.php)(.*)$;
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
include /etc/nginx/fastcgi_params;
}

# deny access to .htaccess/.htpasswd files
location ~ /\.ht {
deny all;
}

autoindex off;
location ~ ^\.md {
return 404;
}

location ~ ^/(app|bin|bootstrap|resources|storage|vendor|logs) {
return 403;
}
}
2 changes: 1 addition & 1 deletion root/etc/cont-init.d/50-config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/with-contenv bash

# create folders
mkdir -p /config/www/xbackbone
Expand Down

0 comments on commit 8960193

Please sign in to comment.