mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-05 11:06:33 +09:00
Compare commits
4 Commits
developmen
...
developmen
| Author | SHA1 | Date | |
|---|---|---|---|
|
fd57557021 | ||
|
8e6a2394a6 | ||
|
ab650ac006 | ||
|
|
3f23522949 |
@@ -1,6 +1,6 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -9,9 +9,6 @@ ARG HEIMDALL_RELEASE
|
||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||
LABEL maintainer="aptalca"
|
||||
|
||||
# environment settings
|
||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
@@ -45,6 +42,7 @@ RUN \
|
||||
tar xf \
|
||||
/tmp/heimdall.tar.gz -C \
|
||||
/app/www-tmp --strip-components=1 && \
|
||||
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
|
||||
echo "**** cleanup ****" && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -9,9 +9,6 @@ ARG HEIMDALL_RELEASE
|
||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||
LABEL maintainer="aptalca"
|
||||
|
||||
# environment settings
|
||||
ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
@@ -45,6 +42,7 @@ RUN \
|
||||
tar xf \
|
||||
/tmp/heimdall.tar.gz -C \
|
||||
/app/www-tmp --strip-components=1 && \
|
||||
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
|
||||
echo "**** cleanup ****" && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
|
||||
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@@ -34,8 +34,8 @@ pipeline {
|
||||
CI_PORT='80'
|
||||
CI_SSL='false'
|
||||
CI_DELAY='120'
|
||||
CI_DOCKERENV='TZ=US/Pacific'
|
||||
CI_AUTH='user:password'
|
||||
CI_DOCKERENV=''
|
||||
CI_AUTH=''
|
||||
CI_WEBPATH=''
|
||||
}
|
||||
stages {
|
||||
|
||||
@@ -74,7 +74,6 @@ This image provides various versions that are available via tags. Please read th
|
||||
|
||||
Access the web gui at http://SERVERIP:PORT
|
||||
|
||||
|
||||
### Adding password protection
|
||||
|
||||
This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.
|
||||
@@ -292,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **27.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
|
||||
* **07.03.24:** - Enable the opcache and disable file revalidation.
|
||||
* **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
|
||||
* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
|
||||
|
||||
@@ -6,7 +6,6 @@ external_type: github_commit
|
||||
release_type: prerelease
|
||||
release_tag: development
|
||||
ls_branch: development
|
||||
build_armhf: false
|
||||
repo_vars:
|
||||
- EXT_GIT_BRANCH = '2.x'
|
||||
- EXT_USER = 'linuxserver'
|
||||
@@ -25,6 +24,6 @@ repo_vars:
|
||||
- CI_PORT='80'
|
||||
- CI_SSL='false'
|
||||
- CI_DELAY='120'
|
||||
- CI_DOCKERENV='TZ=US/Pacific'
|
||||
- CI_AUTH='user:password'
|
||||
- CI_DOCKERENV=''
|
||||
- CI_AUTH=''
|
||||
- CI_WEBPATH=''
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
NAME VERSION TYPE
|
||||
Hidden Input 1, 0, 0, 0 dotnet
|
||||
alpine-baselayout 3.4.3-r2 apk
|
||||
alpine-baselayout-data 3.4.3-r2 apk
|
||||
alpine-baselayout 3.6.5-r0 apk
|
||||
alpine-baselayout-data 3.6.5-r0 apk
|
||||
alpine-keys 2.4-r1 apk
|
||||
alpine-release 3.19.1-r0 apk
|
||||
alpine-release 3.20.1-r0 apk
|
||||
apache2-utils 2.4.59-r0 apk
|
||||
apk-tools 2.14.4-r0 apk
|
||||
apr 1.7.4-r0 apk
|
||||
@@ -13,12 +13,12 @@ aws/aws-crt-php v1.2.4 php-composer
|
||||
aws/aws-sdk-php 3.299.1 php-composer
|
||||
barryvdh/laravel-ide-helper v2.15.1 php-composer
|
||||
barryvdh/reflection-docblock v2.1.1 php-composer
|
||||
bash 5.2.21-r0 apk
|
||||
bash 5.2.26-r0 apk
|
||||
brick/math 0.11.0 php-composer
|
||||
brotli-libs 1.1.0-r1 apk
|
||||
busybox 1.36.1-r19 apk
|
||||
busybox-binsh 1.36.1-r19 apk
|
||||
c-ares 1.27.0-r0 apk
|
||||
brotli-libs 1.1.0-r2 apk
|
||||
busybox 1.36.1-r29 apk
|
||||
busybox-binsh 1.36.1-r29 apk
|
||||
c-ares 1.28.1-r0 apk
|
||||
ca-certificates 20240226-r0 apk
|
||||
ca-certificates-bundle 20240226-r0 apk
|
||||
carbonphp/carbon-doctrine-types 2.1.0 php-composer
|
||||
@@ -27,11 +27,11 @@ clue/stream-filter v1.7.0 php-composer
|
||||
composer 2.7.7 binary
|
||||
composer/class-map-generator 1.1.0 php-composer
|
||||
composer/pcre 3.1.1 php-composer
|
||||
coreutils 9.4-r2 apk
|
||||
coreutils-env 9.4-r2 apk
|
||||
coreutils-fmt 9.4-r2 apk
|
||||
coreutils-sha512sum 9.4-r2 apk
|
||||
curl 8.5.0-r0 apk
|
||||
coreutils 9.5-r1 apk
|
||||
coreutils-env 9.5-r1 apk
|
||||
coreutils-fmt 9.5-r1 apk
|
||||
coreutils-sha512sum 9.5-r1 apk
|
||||
curl 8.7.1-r0 apk
|
||||
dflydev/dot-access-data v3.0.2 php-composer
|
||||
doctrine/cache 2.2.0 php-composer
|
||||
doctrine/dbal 3.8.2 php-composer
|
||||
@@ -46,7 +46,8 @@ fakerphp/faker v1.23.1 php-composer
|
||||
filp/whoops 2.15.4 php-composer
|
||||
findutils 4.9.0-r5 apk
|
||||
fruitcake/php-cors v1.3.0 php-composer
|
||||
git 2.43.4-r0 apk
|
||||
git 2.45.2-r0 apk
|
||||
git-init-template 2.45.2-r0 apk
|
||||
graham-campbell/bounded-cache v2.2.0 php-composer
|
||||
graham-campbell/github v12.4.0 php-composer
|
||||
graham-campbell/manager v5.1.0 php-composer
|
||||
@@ -56,8 +57,8 @@ guzzlehttp/promises 2.0.2 php-composer
|
||||
guzzlehttp/psr7 2.6.2 php-composer
|
||||
guzzlehttp/uri-template v1.0.3 php-composer
|
||||
hamcrest/hamcrest-php v2.0.1 php-composer
|
||||
icu-data-en 74.1-r0 apk
|
||||
icu-libs 74.1-r0 apk
|
||||
icu-data-en 74.2-r0 apk
|
||||
icu-libs 74.2-r0 apk
|
||||
jq 1.7.1-r0 apk
|
||||
knplabs/github-api v3.13.0 php-composer
|
||||
laravel/framework v10.44.0 php-composer
|
||||
@@ -73,51 +74,51 @@ league/flysystem 3.24.0 php-composer
|
||||
league/flysystem-aws-s3-v3 3.24.0 php-composer
|
||||
league/flysystem-local 3.23.1 php-composer
|
||||
league/mime-type-detection 1.15.0 php-composer
|
||||
libacl 2.3.1-r4 apk
|
||||
libattr 2.5.1-r5 apk
|
||||
libbsd 0.11.7-r3 apk
|
||||
libacl 2.3.2-r0 apk
|
||||
libattr 2.5.2-r0 apk
|
||||
libbsd 0.12.2-r0 apk
|
||||
libbz2 1.0.8-r6 apk
|
||||
libc-utils 0.7.2-r5 apk
|
||||
libcrypto3 3.1.5-r0 apk
|
||||
libcurl 8.5.0-r0 apk
|
||||
libedit 20230828.3.1-r3 apk
|
||||
libcrypto3 3.3.1-r0 apk
|
||||
libcurl 8.7.1-r0 apk
|
||||
libedit 20240517.3.1-r0 apk
|
||||
libexpat 2.6.2-r0 apk
|
||||
libgcc 13.2.1_git20231014-r0 apk
|
||||
libidn2 2.3.4-r4 apk
|
||||
libintl 0.22.3-r0 apk
|
||||
libgcc 13.2.1_git20240309-r0 apk
|
||||
libidn2 2.3.7-r0 apk
|
||||
libintl 0.22.5-r0 apk
|
||||
libmd 1.1.0-r0 apk
|
||||
libncursesw 6.4_p20231125-r0 apk
|
||||
libncursesw 6.4_p20240420-r0 apk
|
||||
libpq 16.3-r0 apk
|
||||
libproc2 4.0.4-r0 apk
|
||||
libssl3 3.1.5-r0 apk
|
||||
libstdc++ 13.2.1_git20231014-r0 apk
|
||||
libunistring 1.1-r2 apk
|
||||
libuuid 2.39.3-r0 apk
|
||||
libxml2 2.11.8-r0 apk
|
||||
libpsl 0.21.5-r1 apk
|
||||
libssl3 3.3.1-r0 apk
|
||||
libstdc++ 13.2.1_git20240309-r0 apk
|
||||
libunistring 1.2-r0 apk
|
||||
libuuid 2.40.1-r1 apk
|
||||
libxml2 2.12.7-r0 apk
|
||||
libzip 1.10.1-r0 apk
|
||||
linux-pam 1.5.3-r7 apk
|
||||
linux-pam 1.6.0-r0 apk
|
||||
logrotate 3.21.0-r1 apk
|
||||
mockery/mockery 1.6.7 php-composer
|
||||
monolog/monolog 3.5.0 php-composer
|
||||
mtdowling/jmespath.php 2.7.0 php-composer
|
||||
musl 1.2.4_git20230717-r4 apk
|
||||
musl-utils 1.2.4_git20230717-r4 apk
|
||||
musl 1.2.5-r0 apk
|
||||
musl-utils 1.2.5-r0 apk
|
||||
myclabs/deep-copy 1.11.1 php-composer
|
||||
nano 7.2-r1 apk
|
||||
ncurses-terminfo-base 6.4_p20231125-r0 apk
|
||||
nano 8.0-r0 apk
|
||||
ncurses-terminfo-base 6.4_p20240420-r0 apk
|
||||
nesbot/carbon 2.72.3 php-composer
|
||||
netcat-openbsd 1.226-r0 apk
|
||||
nette/schema v1.3.0 php-composer
|
||||
nette/utils v4.0.4 php-composer
|
||||
nghttp2-libs 1.58.0-r0 apk
|
||||
nginx 1.24.0-r16 apk
|
||||
nghttp2-libs 1.62.0-r0 apk
|
||||
nginx 1.26.1-r0 apk
|
||||
nikic/php-parser v5.0.0 php-composer
|
||||
nunomaduro/collision v6.4.0 php-composer
|
||||
nunomaduro/termwind v1.15.1 php-composer
|
||||
oniguruma 6.9.9-r0 apk
|
||||
openssl 3.1.5-r0 apk
|
||||
openssl 3.3.1-r0 apk
|
||||
pcre 8.45-r3 apk
|
||||
pcre2 10.42-r2 apk
|
||||
pcre2 10.43-r0 apk
|
||||
phar-io/manifest 2.0.3 php-composer
|
||||
phar-io/version 3.2.1 php-composer
|
||||
php-http/cache-plugin 1.8.1 php-composer
|
||||
@@ -177,7 +178,7 @@ psy/psysh v0.12.0 php-composer
|
||||
ralouphie/getallheaders 3.0.3 php-composer
|
||||
ramsey/collection 2.0.0 php-composer
|
||||
ramsey/uuid 4.7.5 php-composer
|
||||
readline 8.2.1-r2 apk
|
||||
readline 8.2.10-r0 apk
|
||||
scanelf 1.3.7-r2 apk
|
||||
sebastian/cli-parser 1.0.1 php-composer
|
||||
sebastian/code-unit 1.0.8 php-composer
|
||||
@@ -195,15 +196,15 @@ sebastian/recursion-context 4.0.5 php-composer
|
||||
sebastian/resource-operations 3.0.3 php-composer
|
||||
sebastian/type 3.2.1 php-composer
|
||||
sebastian/version 3.0.2 php-composer
|
||||
shadow 4.14.2-r0 apk
|
||||
skalibs 2.14.0.1-r0 apk
|
||||
shadow 4.15.1-r0 apk
|
||||
skalibs 2.14.1.1-r0 apk
|
||||
spatie/backtrace 1.5.3 php-composer
|
||||
spatie/flare-client-php 1.4.4 php-composer
|
||||
spatie/ignition 1.12.0 php-composer
|
||||
spatie/laravel-ignition 2.4.2 php-composer
|
||||
sqlite-libs 3.44.2-r0 apk
|
||||
sqlite-libs 3.45.3-r1 apk
|
||||
squizlabs/php_codesniffer 3.9.0 php-composer
|
||||
ssl_client 1.36.1-r19 apk
|
||||
ssl_client 1.36.1-r29 apk
|
||||
symfony/cache v6.4.3 php-composer
|
||||
symfony/cache-contracts v3.4.0 php-composer
|
||||
symfony/console v6.4.3 php-composer
|
||||
@@ -240,11 +241,11 @@ symfony/var-exporter v7.0.3 php-composer
|
||||
symfony/yaml v6.4.3 php-composer
|
||||
theseer/tokenizer 1.2.2 php-composer
|
||||
tijsverkoyen/css-to-inline-styles v2.2.7 php-composer
|
||||
tzdata 2024a-r0 apk
|
||||
utmps-libs 0.1.2.2-r0 apk
|
||||
tzdata 2024a-r1 apk
|
||||
utmps-libs 0.1.2.2-r1 apk
|
||||
vlucas/phpdotenv v5.6.0 php-composer
|
||||
voku/portable-ascii 2.0.1 php-composer
|
||||
webmozart/assert 1.11.0 php-composer
|
||||
xz-libs 5.4.5-r0 apk
|
||||
zlib 1.3.1-r0 apk
|
||||
zstd-libs 1.5.5-r8 apk
|
||||
xz-libs 5.6.1-r3 apk
|
||||
zlib 1.3.1-r1 apk
|
||||
zstd-libs 1.5.6-r0 apk
|
||||
|
||||
@@ -33,31 +33,19 @@ param_usage_include_ports: true
|
||||
param_ports:
|
||||
- { external_port: "80", internal_port: "80", port_desc: "http gui" }
|
||||
- { external_port: "443", internal_port: "443", port_desc: "https gui" }
|
||||
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 parameters
|
||||
optional_block_1: false
|
||||
optional_block_1_items:
|
||||
- |
|
||||
Using tags, you can switch between the stable releases of Heimdall and the master branch. No tag is required for the latest stable release.
|
||||
Add the development tag, if required, to the linuxserver/heimdall line of the run/create command in the following format, linuxserver/heimdall:development
|
||||
The development tag will be the latest commit in the master branch of Heimdall.
|
||||
HOWEVER , USE THE DEVELOPMENT TAG AT YOUR OWN PERIL !!!!!!!!!
|
||||
|
||||
# application setup block
|
||||
app_setup_block_enabled: true
|
||||
app_setup_block: |
|
||||
Access the web gui at http://SERVERIP:PORT
|
||||
|
||||
|
||||
### Adding password protection
|
||||
|
||||
|
||||
This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "27.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
|
||||
- { date: "07.03.24:", desc: "Enable the opcache and disable file revalidation."}
|
||||
- { date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
|
||||
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
## Version 2024/03/06 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
## Version 2024/06/27 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
|
||||
server {
|
||||
listen 80 default_server;
|
||||
listen [::]:80 default_server;
|
||||
|
||||
listen 443 ssl http2 default_server;
|
||||
listen [::]:443 ssl http2 default_server;
|
||||
listen *:80 default_server;
|
||||
listen *:443 ssl default_server;
|
||||
|
||||
server_name _;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
|
||||
exec \
|
||||
s6-setuidgid abc php /app/www/artisan queue:work database --sleep=3 --tries=3
|
||||
|
||||
1
root/migrations/02-default-location
Normal file → Executable file
1
root/migrations/02-default-location
Normal file → Executable file
@@ -1,4 +1,5 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
# shellcheck shell=bash
|
||||
|
||||
DEFAULT_CONF="/config/nginx/site-confs/default.conf"
|
||||
OLD_ROOT="root /var/www/localhost/heimdall/public;"
|
||||
|
||||
Reference in New Issue
Block a user