From a64b9e838ad91ca63d4ee3c9fd6c9b9d1915eef2 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 5 Nov 2018 16:03:55 -0500 Subject: [PATCH] pull the master branch of heimdall --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- README.md | 8 ++++++++ readme-vars.yml | 9 +++++++-- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4267c5b..77fb1d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,8 @@ RUN \ mkdir -p \ /var/www/localhost/heimdall && \ if [ -z ${HEIMDALL_RELEASE+x} ]; then \ - HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/heimdall.tar.gz -L \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f73f611..8ca19a8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -26,8 +26,8 @@ RUN \ mkdir -p \ /var/www/localhost/heimdall && \ if [ -z ${HEIMDALL_RELEASE+x} ]; then \ - HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/heimdall.tar.gz -L \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 145a813..4e5e7a7 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -26,8 +26,8 @@ RUN \ mkdir -p \ /var/www/localhost/heimdall && \ if [ -z ${HEIMDALL_RELEASE+x} ]; then \ - HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \ + | awk '/sha/{print $4;exit}' FS='[""]'); \ fi && \ curl -o \ /tmp/heimdall.tar.gz -L \ diff --git a/README.md b/README.md index c254f61..8c523e8 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ From August 2018 onwards, Linuxserver are in the midst of switching to a new CI TLDR: Multi-arch support is changing from multiple repos to one repo per container image. # [linuxserver/heimdall](https://github.com/linuxserver/docker-heimdall) +[![](https://img.shields.io/discord/354974912613449730.svg?logo=discord&label=LSIO%20Discord&style=flat-square)](https://discord.gg/YWrKVTn) [![](https://images.microbadger.com/badges/version/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/image/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com") ![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg) @@ -59,9 +60,15 @@ docker create \ -p 80:80 \ -p 443:443 \ -v :/config \ + --restart unless-stopped linuxserver/heimdall ``` +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 !!!!!!!!! + ### docker-compose @@ -136,6 +143,7 @@ This image now supports password protection through htpasswd. Run the following ## Versions +* **04.11.18:** - Add php7-zip. * **31.10.18:** - Add queue service. * **17.10.18:** - Symlink avatars folder. * **16.10.18:** - Updated fastcgi_params for user login support. diff --git a/readme-vars.yml b/readme-vars.yml index 6428f23..56ab238 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -32,8 +32,13 @@ 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: "" +optional_block_1: true +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