mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-03-31 17:17:07 +09:00
Compare commits
28 Commits
developmen
...
developmen
| Author | SHA1 | Date | |
|---|---|---|---|
|
5498349626 | ||
|
|
eabd8a6738 | ||
|
|
82f1f4d934 | ||
|
|
7237d6ca9a | ||
|
|
2275a8fb64 | ||
|
|
d545593107 | ||
|
|
34f7492c97 | ||
|
|
134b3e9533 | ||
|
|
8217bd55ea | ||
|
|
1761816c42 | ||
|
|
ab5fc6b23d | ||
|
|
f9d2fca42c | ||
|
fbe856fab3 | ||
|
|
5a251cd21c | ||
|
|
19e3093840 | ||
|
|
3e5d65217a | ||
|
|
1e5c88de48 | ||
|
|
44612aa569 | ||
|
|
8706d29fe0 | ||
|
|
136dbe61bf | ||
|
|
5977b7440e | ||
|
|
d04a852a8d | ||
|
|
a636e8534c | ||
|
|
c5693232f4 | ||
|
|
6d7fad2d98 | ||
|
|
204bad5de9 | ||
|
|
3779275528 | ||
|
|
c4ab19e354 |
1
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
1
.github/ISSUE_TEMPLATE/issue.bug.yml
vendored
@@ -53,7 +53,6 @@ body:
|
||||
options:
|
||||
- x86-64
|
||||
- arm64
|
||||
- armhf
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
|
||||
6
.github/workflows/call_issue_pr_tracker.yml
vendored
6
.github/workflows/call_issue_pr_tracker.yml
vendored
@@ -2,9 +2,11 @@ name: Issue & PR Tracker
|
||||
|
||||
on:
|
||||
issues:
|
||||
types: [opened,reopened,labeled,unlabeled]
|
||||
types: [opened,reopened,labeled,unlabeled,closed]
|
||||
pull_request_target:
|
||||
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
|
||||
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
|
||||
pull_request_review:
|
||||
types: [submitted,edited,dismissed]
|
||||
|
||||
jobs:
|
||||
manage-project:
|
||||
|
||||
8
.github/workflows/external_trigger.yml
vendored
8
.github/workflows/external_trigger.yml
vendored
@@ -14,9 +14,11 @@ jobs:
|
||||
run: |
|
||||
if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT }}" ]; then
|
||||
echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT is set; skipping trigger. ****"
|
||||
echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
||||
exit 0
|
||||
fi
|
||||
echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\". ****"
|
||||
echo "External trigger running off of development branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY
|
||||
echo "**** Retrieving external version ****"
|
||||
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" | jq -r '. | .sha' | cut -c1-8)
|
||||
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
|
||||
@@ -30,6 +32,7 @@ jobs:
|
||||
fi
|
||||
EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
|
||||
echo "**** External version: ${EXT_RELEASE} ****"
|
||||
echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
|
||||
echo "**** Retrieving last pushed version ****"
|
||||
image="linuxserver/heimdall"
|
||||
tag="development"
|
||||
@@ -65,14 +68,18 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
echo "**** Last pushed version: ${IMAGE_VERSION} ****"
|
||||
echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
|
||||
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
|
||||
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
|
||||
echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
|
||||
exit 0
|
||||
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
|
||||
echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
|
||||
echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
|
||||
exit 0
|
||||
else
|
||||
echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
|
||||
echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
|
||||
response=$(curl -iX POST \
|
||||
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=false \
|
||||
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
||||
@@ -82,6 +89,7 @@ jobs:
|
||||
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
|
||||
buildurl="${buildurl%$'\r'}"
|
||||
echo "**** Jenkins job build url: ${buildurl} ****"
|
||||
echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
|
||||
echo "**** Attempting to change the Jenkins job description ****"
|
||||
curl -iX POST \
|
||||
"${buildurl}submitDescription" \
|
||||
|
||||
18
.github/workflows/external_trigger_scheduler.yml
vendored
18
.github/workflows/external_trigger_scheduler.yml
vendored
@@ -2,7 +2,7 @@ name: External Trigger Scheduler
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '35 * * * *'
|
||||
- cron: '39 * * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
@@ -17,18 +17,18 @@ jobs:
|
||||
run: |
|
||||
echo "**** Branches found: ****"
|
||||
git for-each-ref --format='%(refname:short)' refs/remotes
|
||||
echo "**** Pulling the yq docker image ****"
|
||||
docker pull ghcr.io/linuxserver/yq
|
||||
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
|
||||
do
|
||||
br=$(echo "$br" | sed 's|origin/||g')
|
||||
echo "**** Evaluating branch ${br} ****"
|
||||
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml \
|
||||
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
|
||||
if [ "$br" == "$ls_branch" ]; then
|
||||
echo "**** Branch ${br} appears to be live; checking workflow. ****"
|
||||
ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml)
|
||||
ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
|
||||
ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
|
||||
if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
|
||||
echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
|
||||
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
|
||||
echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
|
||||
echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
|
||||
curl -iX POST \
|
||||
-H "Authorization: token ${{ secrets.CR_PAT }}" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
@@ -36,8 +36,10 @@ jobs:
|
||||
https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/external_trigger.yml/dispatches
|
||||
else
|
||||
echo "**** Workflow doesn't exist; skipping trigger. ****"
|
||||
echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
else
|
||||
echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
|
||||
echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
|
||||
echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
done
|
||||
|
||||
4
.github/workflows/package_trigger.yml
vendored
4
.github/workflows/package_trigger.yml
vendored
@@ -14,13 +14,16 @@ jobs:
|
||||
run: |
|
||||
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT }}" ]; then
|
||||
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT is set; skipping trigger. ****"
|
||||
echo "Github secret \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
||||
exit 0
|
||||
fi
|
||||
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
|
||||
echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
|
||||
echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
|
||||
exit 0
|
||||
fi
|
||||
echo "**** Package trigger running off of development branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\". ****"
|
||||
echo "Package trigger running off of development branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY
|
||||
response=$(curl -iX POST \
|
||||
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=true \
|
||||
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
||||
@@ -30,6 +33,7 @@ jobs:
|
||||
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
|
||||
buildurl="${buildurl%$'\r'}"
|
||||
echo "**** Jenkins job build url: ${buildurl} ****"
|
||||
echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
|
||||
echo "**** Attempting to change the Jenkins job description ****"
|
||||
curl -iX POST \
|
||||
"${buildurl}submitDescription" \
|
||||
|
||||
@@ -17,18 +17,16 @@ jobs:
|
||||
run: |
|
||||
echo "**** Branches found: ****"
|
||||
git for-each-ref --format='%(refname:short)' refs/remotes
|
||||
echo "**** Pulling the yq docker image ****"
|
||||
docker pull ghcr.io/linuxserver/yq
|
||||
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
|
||||
do
|
||||
br=$(echo "$br" | sed 's|origin/||g')
|
||||
echo "**** Evaluating branch ${br} ****"
|
||||
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml \
|
||||
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
|
||||
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml | yq -r '.ls_branch')
|
||||
if [ "${br}" == "${ls_branch}" ]; then
|
||||
echo "**** Branch ${br} appears to be live; checking workflow. ****"
|
||||
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
|
||||
echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
|
||||
echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
|
||||
triggered_branches="${triggered_branches}${br} "
|
||||
curl -iX POST \
|
||||
-H "Authorization: token ${{ secrets.CR_PAT }}" \
|
||||
@@ -38,9 +36,11 @@ jobs:
|
||||
sleep 30
|
||||
else
|
||||
echo "**** Workflow doesn't exist; skipping trigger. ****"
|
||||
echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
else
|
||||
echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
|
||||
echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
|
||||
fi
|
||||
done
|
||||
echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
|
||||
|
||||
17
Dockerfile
17
Dockerfile
@@ -1,6 +1,6 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -14,15 +14,12 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache --upgrade \
|
||||
php81-ctype \
|
||||
php81-curl \
|
||||
php81-intl \
|
||||
php81-pdo_pgsql \
|
||||
php81-pdo_sqlite \
|
||||
php81-pdo_mysql \
|
||||
php81-tokenizer \
|
||||
php81-zip && \
|
||||
apk add --no-cache \
|
||||
php82-intl \
|
||||
php82-pdo_pgsql \
|
||||
php82-pdo_sqlite \
|
||||
php82-pdo_mysql \
|
||||
php82-tokenizer && \
|
||||
echo "**** configure nginx ****" && \
|
||||
echo 'fastcgi_param PHP_AUTH_USER $remote_user; # Heimdall user authorization' >> \
|
||||
/etc/nginx/fastcgi_params && \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
@@ -14,15 +14,12 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
|
||||
|
||||
RUN \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache --upgrade \
|
||||
php81-ctype \
|
||||
php81-curl \
|
||||
php81-intl \
|
||||
php81-pdo_pgsql \
|
||||
php81-pdo_sqlite \
|
||||
php81-pdo_mysql \
|
||||
php81-tokenizer \
|
||||
php81-zip && \
|
||||
apk add --no-cache \
|
||||
php82-intl \
|
||||
php82-pdo_pgsql \
|
||||
php82-pdo_sqlite \
|
||||
php82-pdo_mysql \
|
||||
php82-tokenizer && \
|
||||
echo "**** configure nginx ****" && \
|
||||
echo 'fastcgi_param PHP_AUTH_USER $remote_user; # Heimdall user authorization' >> \
|
||||
/etc/nginx/fastcgi_params && \
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
ARG VERSION
|
||||
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 --upgrade \
|
||||
php81-ctype \
|
||||
php81-curl \
|
||||
php81-intl \
|
||||
php81-pdo_pgsql \
|
||||
php81-pdo_sqlite \
|
||||
php81-pdo_mysql \
|
||||
php81-tokenizer \
|
||||
php81-zip && \
|
||||
echo "**** configure nginx ****" && \
|
||||
echo 'fastcgi_param PHP_AUTH_USER $remote_user; # Heimdall user authorization' >> \
|
||||
/etc/nginx/fastcgi_params && \
|
||||
echo 'fastcgi_param PHP_AUTH_PW $http_authorization; # Heimdall user authorization' >> \
|
||||
/etc/nginx/fastcgi_params && \
|
||||
echo "**** install heimdall ****" && \
|
||||
mkdir -p \
|
||||
/heimdall && \
|
||||
if [ -z ${HEIMDALL_RELEASE+x} ]; then \
|
||||
HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" \
|
||||
| awk '/sha/{print $4;exit}' FS='[""]'); \
|
||||
fi && \
|
||||
curl -o \
|
||||
/tmp/heimdall.tar.gz -L \
|
||||
"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
|
||||
mkdir -p \
|
||||
/app/www-tmp && \
|
||||
tar xf \
|
||||
/tmp/heimdall.tar.gz -C \
|
||||
/app/www-tmp --strip-components=1 && \
|
||||
echo "**** cleanup ****" && \
|
||||
rm -rf \
|
||||
/tmp/*
|
||||
|
||||
# add local files
|
||||
COPY root/ /
|
||||
|
||||
# ports and volumes
|
||||
EXPOSE 80 443
|
||||
VOLUME /config
|
||||
261
Jenkinsfile
vendored
261
Jenkinsfile
vendored
@@ -42,10 +42,16 @@ pipeline {
|
||||
// Setup all the basic environment variables needed for the build
|
||||
stage("Set ENV Variables base"){
|
||||
steps{
|
||||
sh '''#! /bin/bash
|
||||
containers=$(docker ps -aq)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || : '''
|
||||
script{
|
||||
env.EXIT_STATUS = ''
|
||||
env.LS_RELEASE = sh(
|
||||
script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':development 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
|
||||
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:development 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
|
||||
returnStdout: true).trim()
|
||||
env.LS_RELEASE_NOTES = sh(
|
||||
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
|
||||
@@ -167,7 +173,7 @@ pipeline {
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||
env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||
} else {
|
||||
env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||
}
|
||||
@@ -190,7 +196,7 @@ pipeline {
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||
env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||
} else {
|
||||
env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||
}
|
||||
@@ -213,12 +219,12 @@ pipeline {
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||
env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
} else {
|
||||
env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||
env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
}
|
||||
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||
env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN
|
||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
|
||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
|
||||
@@ -238,7 +244,7 @@ pipeline {
|
||||
script{
|
||||
env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
|
||||
}
|
||||
sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
|
||||
sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
|
||||
sh '''#! /bin/bash
|
||||
docker run --rm \
|
||||
-v ${WORKSPACE}:/mnt \
|
||||
@@ -284,7 +290,7 @@ pipeline {
|
||||
echo "Jenkinsfile is up to date."
|
||||
fi
|
||||
# Stage 2 - Delete old templates
|
||||
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
|
||||
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
|
||||
for i in ${OLD_TEMPLATES}; do
|
||||
if [[ -f "${i}" ]]; then
|
||||
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
|
||||
@@ -320,12 +326,13 @@ pipeline {
|
||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
|
||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
|
||||
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
|
||||
cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
|
||||
cd ${TEMPDIR}/repo/${LS_REPO}/
|
||||
if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
|
||||
echo ".jenkins-external" >> .gitignore
|
||||
git add .gitignore
|
||||
fi
|
||||
git add ${TEMPLATED_FILES}
|
||||
git add readme-vars.yml ${TEMPLATED_FILES}
|
||||
git commit -m 'Bot Updating Templated Files'
|
||||
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
|
||||
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
@@ -346,6 +353,8 @@ pipeline {
|
||||
git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
|
||||
if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
|
||||
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
||||
elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
|
||||
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
||||
fi
|
||||
if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
|
||||
cd ${TEMPDIR}/unraid/templates/
|
||||
@@ -386,6 +395,26 @@ pipeline {
|
||||
}
|
||||
}
|
||||
}
|
||||
// If this is a development build check the S6 service file perms
|
||||
stage("Check S6 Service file Permissions"){
|
||||
when {
|
||||
branch "development"
|
||||
environment name: 'CHANGE_ID', value: ''
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
script{
|
||||
sh '''#! /bin/bash
|
||||
WRONG_PERM=$(find ./ -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
|
||||
if [[ -n "${WRONG_PERM}" ]]; then
|
||||
echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
|
||||
exit 1
|
||||
else
|
||||
echo "S6 service file perms look good."
|
||||
fi '''
|
||||
}
|
||||
}
|
||||
}
|
||||
/* #######################
|
||||
GitLab Mirroring
|
||||
####################### */
|
||||
@@ -417,8 +446,7 @@ pipeline {
|
||||
}
|
||||
steps{
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/heimdall") | .uuid')
|
||||
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/heimdall") | .uuid' || :)
|
||||
if [ -z "${PACKAGE_UUID}" ]; then
|
||||
echo "Adding package to Scarf.sh"
|
||||
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
|
||||
@@ -498,41 +526,6 @@ pipeline {
|
||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
||||
}
|
||||
}
|
||||
stage('Build ARMHF') {
|
||||
agent {
|
||||
label 'ARMHF'
|
||||
}
|
||||
steps {
|
||||
echo "Running on node: ${NODE_NAME}"
|
||||
echo 'Logging into Github'
|
||||
sh '''#! /bin/bash
|
||||
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
|
||||
'''
|
||||
sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
|
||||
sh "docker buildx build \
|
||||
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
|
||||
--label \"org.opencontainers.image.authors=linuxserver.io\" \
|
||||
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-heimdall/packages\" \
|
||||
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-heimdall\" \
|
||||
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-heimdall\" \
|
||||
--label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
|
||||
--label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
|
||||
--label \"org.opencontainers.image.vendor=linuxserver.io\" \
|
||||
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
|
||||
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
|
||||
--label \"org.opencontainers.image.title=Heimdall\" \
|
||||
--label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way. Simplicity is the key to Heimdall. Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo. \" \
|
||||
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
|
||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
||||
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||
retry(5) {
|
||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||
}
|
||||
sh '''docker rmi \
|
||||
${IMAGE}:arm32v7-${META_TAG} \
|
||||
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
|
||||
}
|
||||
}
|
||||
stage('Build ARM64') {
|
||||
agent {
|
||||
label 'ARM64'
|
||||
@@ -563,9 +556,12 @@ pipeline {
|
||||
retry(5) {
|
||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||
}
|
||||
sh '''docker rmi \
|
||||
${IMAGE}:arm64v8-${META_TAG} \
|
||||
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
|
||||
sh '''#! /bin/bash
|
||||
containers=$(docker ps -aq)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || : '''
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -626,13 +622,6 @@ pipeline {
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "Packages were updated. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
fi'''
|
||||
script{
|
||||
env.EXIT_STATUS = 'ABORTED'
|
||||
}
|
||||
@@ -650,13 +639,6 @@ pipeline {
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "There are no package updates. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
fi'''
|
||||
script{
|
||||
env.EXIT_STATUS = 'ABORTED'
|
||||
}
|
||||
@@ -678,14 +660,13 @@ pipeline {
|
||||
]) {
|
||||
script{
|
||||
env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
|
||||
env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
|
||||
}
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
docker pull ghcr.io/linuxserver/ci:latest
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||
fi
|
||||
docker run --rm \
|
||||
@@ -704,8 +685,6 @@ pipeline {
|
||||
-e WEB_SCREENSHOT=\"${CI_WEB}\" \
|
||||
-e WEB_AUTH=\"${CI_AUTH}\" \
|
||||
-e WEB_PATH=\"${CI_WEBPATH}\" \
|
||||
-e DO_REGION="ams3" \
|
||||
-e DO_BUCKET="lsio-ci" \
|
||||
-t ghcr.io/linuxserver/ci:latest \
|
||||
python3 test_build.py'''
|
||||
}
|
||||
@@ -758,17 +737,6 @@ pipeline {
|
||||
done
|
||||
'''
|
||||
}
|
||||
sh '''#! /bin/bash
|
||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:${META_TAG} \
|
||||
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
|
||||
${DELETEIMAGE}:development || :
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker rmi ${DELETEIMAGE}:${SEMVER} || :
|
||||
fi
|
||||
done
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -801,8 +769,6 @@ pipeline {
|
||||
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
||||
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
||||
if [ "${CI}" == "false" ]; then
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||
fi
|
||||
@@ -810,49 +776,47 @@ pipeline {
|
||||
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-development
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-development
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-development
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
fi
|
||||
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||
docker push ${MANIFESTIMAGE}:amd64-development
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-development
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-development
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
fi
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:development || :
|
||||
docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development
|
||||
docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm
|
||||
docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development
|
||||
docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
|
||||
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
|
||||
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
|
||||
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
|
||||
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
|
||||
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
|
||||
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
|
||||
fi
|
||||
token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
|
||||
digest=$(curl -s \
|
||||
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
|
||||
--header "Authorization: Bearer ${token}" \
|
||||
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-development")
|
||||
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development || :
|
||||
docker manifest create ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:amd64-development
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development
|
||||
fi
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:development
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
|
||||
@@ -862,29 +826,6 @@ pipeline {
|
||||
done
|
||||
'''
|
||||
}
|
||||
sh '''#! /bin/bash
|
||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:amd64-${META_TAG} \
|
||||
${DELETEIMAGE}:amd64-development \
|
||||
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
|
||||
${DELETEIMAGE}:arm32v7-${META_TAG} \
|
||||
${DELETEIMAGE}:arm32v7-development \
|
||||
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
|
||||
${DELETEIMAGE}:arm64v8-${META_TAG} \
|
||||
${DELETEIMAGE}:arm64v8-development \
|
||||
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:amd64-${SEMVER} \
|
||||
${DELETEIMAGE}:arm32v7-${SEMVER} \
|
||||
${DELETEIMAGE}:arm64v8-${SEMVER} || :
|
||||
fi
|
||||
done
|
||||
docker rmi \
|
||||
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
|
||||
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -955,12 +896,78 @@ pipeline {
|
||||
stage('Pull Request Comment') {
|
||||
when {
|
||||
not {environment name: 'CHANGE_ID', value: ''}
|
||||
environment name: 'CI', value: 'true'
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
|
||||
-d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
|
||||
sh '''#! /bin/bash
|
||||
# Function to retrieve JSON data from URL
|
||||
get_json() {
|
||||
local url="$1"
|
||||
local response=$(curl -s "$url")
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to retrieve JSON data from $url"
|
||||
return 1
|
||||
fi
|
||||
local json=$(echo "$response" | jq .)
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Failed to parse JSON data from $url"
|
||||
return 1
|
||||
fi
|
||||
echo "$json"
|
||||
}
|
||||
|
||||
build_table() {
|
||||
local data="$1"
|
||||
|
||||
# Get the keys in the JSON data
|
||||
local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
|
||||
|
||||
# Check if keys are empty
|
||||
if [ -z "$keys" ]; then
|
||||
echo "JSON report data does not contain any keys or the report does not exist."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Build table header
|
||||
local header="| Tag | Passed |\\n| --- | --- |\\n"
|
||||
|
||||
# Loop through the JSON data to build the table rows
|
||||
local rows=""
|
||||
for build in $keys; do
|
||||
local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
|
||||
if [ "$status" = "true" ]; then
|
||||
status="✅"
|
||||
else
|
||||
status="❌"
|
||||
fi
|
||||
local row="| "$build" | "$status" |\\n"
|
||||
rows="${rows}${row}"
|
||||
done
|
||||
|
||||
local table="${header}${rows}"
|
||||
local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
|
||||
echo "$escaped_table"
|
||||
}
|
||||
|
||||
if [[ "${CI}" = "true" ]]; then
|
||||
# Retrieve JSON data from URL
|
||||
data=$(get_json "$CI_JSON_URL")
|
||||
# Create table from JSON data
|
||||
table=$(build_table "$data")
|
||||
echo -e "$table"
|
||||
|
||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
|
||||
else
|
||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||
-d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
|
||||
fi
|
||||
'''
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -986,6 +993,14 @@ pipeline {
|
||||
}
|
||||
}
|
||||
cleanup {
|
||||
sh '''#! /bin/bash
|
||||
echo "Performing docker system prune!!"
|
||||
containers=$(docker ps -aq)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || :
|
||||
'''
|
||||
cleanWs()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ The architectures supported by this image are:
|
||||
| :----: | :----: | ---- |
|
||||
| x86-64 | ✅ | amd64-\<version tag\> |
|
||||
| arm64 | ✅ | arm64v8-\<version tag\> |
|
||||
| armhf | ✅ | arm32v7-\<version tag\> |
|
||||
| armhf | ❌ | |
|
||||
|
||||
## Version Tags
|
||||
|
||||
@@ -242,6 +242,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
|
||||
* **13.04.23:** - Move ssl.conf include to default.conf.
|
||||
* **20.01.23:** - Rebase to alpine 3.17 with php8.1.
|
||||
* **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
|
||||
* **04.11.22:** - Build commits to upstream branch 2.x.
|
||||
|
||||
@@ -6,6 +6,7 @@ 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'
|
||||
|
||||
@@ -1,227 +1,228 @@
|
||||
NAME VERSION TYPE
|
||||
alpine-baselayout 3.4.0-r0 apk
|
||||
alpine-baselayout-data 3.4.0-r0 apk
|
||||
alpine-keys 2.4-r1 apk
|
||||
alpine-release 3.17.3-r0 apk
|
||||
apache2-utils 2.4.56-r0 apk
|
||||
apk-tools 2.12.10-r1 apk
|
||||
apr 1.7.2-r0 apk
|
||||
apr-util 1.6.3-r0 apk
|
||||
argon2-libs 20190702-r2 apk
|
||||
barryvdh/laravel-ide-helper v2.12.3 php-composer
|
||||
barryvdh/reflection-docblock v2.1.0 php-composer
|
||||
bash 5.2.15-r0 apk
|
||||
brick/math 0.9.3 php-composer
|
||||
brotli-libs 1.0.9-r9 apk
|
||||
busybox 1.35.0 binary
|
||||
busybox 1.35.0-r29 apk
|
||||
busybox-binsh 1.35.0-r29 apk
|
||||
ca-certificates 20220614-r4 apk
|
||||
ca-certificates-bundle 20220614-r4 apk
|
||||
clue/stream-filter v1.6.0 php-composer
|
||||
composer/pcre 3.1.0 php-composer
|
||||
coreutils 9.1-r0 apk
|
||||
curl 7.88.1-r1 apk
|
||||
dflydev/dot-access-data v3.0.2 php-composer
|
||||
doctrine/cache 2.2.0 php-composer
|
||||
doctrine/dbal 3.5.1 php-composer
|
||||
doctrine/deprecations v1.0.0 php-composer
|
||||
doctrine/event-manager 1.2.0 php-composer
|
||||
doctrine/inflector 2.0.6 php-composer
|
||||
doctrine/instantiator 1.4.1 php-composer
|
||||
doctrine/lexer 1.2.3 php-composer
|
||||
dragonmantank/cron-expression v3.3.2 php-composer
|
||||
egulias/email-validator 2.1.25 php-composer
|
||||
facade/flare-client-php 1.10.0 php-composer
|
||||
facade/ignition 2.17.6 php-composer
|
||||
facade/ignition-contracts 1.0.2 php-composer
|
||||
fideloper/proxy 4.4.2 php-composer
|
||||
filp/whoops 2.14.6 php-composer
|
||||
fzaninotto/faker v1.9.2 php-composer
|
||||
git 2.38.4-r1 apk
|
||||
graham-campbell/bounded-cache v1.3.0 php-composer
|
||||
graham-campbell/github v10.6.0 php-composer
|
||||
graham-campbell/manager v4.7.0 php-composer
|
||||
graham-campbell/result-type v1.1.0 php-composer
|
||||
guzzlehttp/guzzle 7.5.0 php-composer
|
||||
guzzlehttp/promises 1.5.2 php-composer
|
||||
guzzlehttp/psr7 2.4.3 php-composer
|
||||
hamcrest/hamcrest-php v2.0.1 php-composer
|
||||
icu-data-en 72.1-r1 apk
|
||||
icu-libs 72.1-r1 apk
|
||||
jq 1.6-r2 apk
|
||||
knplabs/github-api v3.6.0 php-composer
|
||||
laravel/framework v8.83.26 php-composer
|
||||
laravel/serializable-closure v1.2.2 php-composer
|
||||
laravel/tinker v2.7.3 php-composer
|
||||
laravel/ui v3.4.6 php-composer
|
||||
laravelcollective/html v6.3.0 php-composer
|
||||
league/commonmark 2.3.7 php-composer
|
||||
league/config v1.1.1 php-composer
|
||||
league/flysystem 1.1.10 php-composer
|
||||
league/mime-type-detection 1.11.0 php-composer
|
||||
libacl 2.3.1-r1 apk
|
||||
libattr 2.5.1-r2 apk
|
||||
libbsd 0.11.7-r0 apk
|
||||
libbz2 1.0.8-r4 apk
|
||||
libc-utils 0.7.2-r3 apk
|
||||
libcrypto3 3.0.8-r3 apk
|
||||
libcurl 7.88.1-r1 apk
|
||||
libedit 20221030.3.1-r0 apk
|
||||
libexpat 2.5.0-r0 apk
|
||||
libgcc 12.2.1_git20220924-r4 apk
|
||||
libintl 0.21.1-r1 apk
|
||||
libmd 1.0.4-r0 apk
|
||||
libpq 15.2-r0 apk
|
||||
libproc 3.3.17-r2 apk
|
||||
libssl3 3.0.8-r3 apk
|
||||
libstdc++ 12.2.1_git20220924-r4 apk
|
||||
libuuid 2.38.1-r1 apk
|
||||
libxml2 2.10.3-r1 apk
|
||||
libzip 1.9.2-r2 apk
|
||||
linux-pam 1.5.2-r1 apk
|
||||
logrotate 3.20.1-r3 apk
|
||||
mockery/mockery 1.5.1 php-composer
|
||||
monolog/monolog 2.8.0 php-composer
|
||||
musl 1.2.3-r4 apk
|
||||
musl-utils 1.2.3-r4 apk
|
||||
myclabs/deep-copy 1.11.0 php-composer
|
||||
nano 7.0-r0 apk
|
||||
ncurses-libs 6.3_p20221119-r0 apk
|
||||
ncurses-terminfo-base 6.3_p20221119-r0 apk
|
||||
nesbot/carbon 2.63.0 php-composer
|
||||
netcat-openbsd 1.130-r4 apk
|
||||
nette/schema v1.2.3 php-composer
|
||||
nette/utils v3.2.8 php-composer
|
||||
nghttp2-libs 1.51.0-r0 apk
|
||||
nginx 1.22.1-r0 apk
|
||||
nikic/php-parser v4.15.2 php-composer
|
||||
nunomaduro/collision v5.11.0 php-composer
|
||||
oniguruma 6.9.8-r0 apk
|
||||
openssl 3.0.8-r3 apk
|
||||
opis/closure 3.6.3 php-composer
|
||||
pcre 8.45-r2 apk
|
||||
pcre2 10.42-r0 apk
|
||||
phar-io/manifest 2.0.3 php-composer
|
||||
phar-io/version 3.2.1 php-composer
|
||||
php-cli 8.1.17 binary
|
||||
php-fpm 8.1.17 binary
|
||||
php-http/cache-plugin 1.7.5 php-composer
|
||||
php-http/client-common 2.6.0 php-composer
|
||||
php-http/discovery 1.14.3 php-composer
|
||||
php-http/httplug 2.3.0 php-composer
|
||||
php-http/message 1.13.0 php-composer
|
||||
php-http/message-factory v1.0.2 php-composer
|
||||
php-http/multipart-stream-builder 1.2.0 php-composer
|
||||
php-http/promise 1.1.0 php-composer
|
||||
php81 8.1.17-r0 apk
|
||||
php81-common 8.1.17-r0 apk
|
||||
php81-ctype 8.1.17-r0 apk
|
||||
php81-curl 8.1.17-r0 apk
|
||||
php81-fileinfo 8.1.17-r0 apk
|
||||
php81-fpm 8.1.17-r0 apk
|
||||
php81-intl 8.1.17-r0 apk
|
||||
php81-mbstring 8.1.17-r0 apk
|
||||
php81-mysqlnd 8.1.17-r0 apk
|
||||
php81-openssl 8.1.17-r0 apk
|
||||
php81-pdo 8.1.17-r0 apk
|
||||
php81-pdo_mysql 8.1.17-r0 apk
|
||||
php81-pdo_pgsql 8.1.17-r0 apk
|
||||
php81-pdo_sqlite 8.1.17-r0 apk
|
||||
php81-session 8.1.17-r0 apk
|
||||
php81-simplexml 8.1.17-r0 apk
|
||||
php81-tokenizer 8.1.17-r0 apk
|
||||
php81-xml 8.1.17-r0 apk
|
||||
php81-xmlwriter 8.1.17-r0 apk
|
||||
php81-zip 8.1.17-r0 apk
|
||||
phpdocumentor/reflection-common 2.2.0 php-composer
|
||||
phpdocumentor/type-resolver 1.6.2 php-composer
|
||||
phpoption/phpoption 1.9.0 php-composer
|
||||
phpunit/php-code-coverage 9.2.19 php-composer
|
||||
phpunit/php-file-iterator 3.0.6 php-composer
|
||||
phpunit/php-invoker 3.1.1 php-composer
|
||||
phpunit/php-text-template 2.0.4 php-composer
|
||||
phpunit/php-timer 5.0.3 php-composer
|
||||
phpunit/phpunit 9.5.26 php-composer
|
||||
popt 1.19-r0 apk
|
||||
procps 3.3.17-r2 apk
|
||||
psr/cache 1.0.1 php-composer
|
||||
psr/container 1.1.2 php-composer
|
||||
psr/event-dispatcher 1.0.0 php-composer
|
||||
psr/http-client 1.0.1 php-composer
|
||||
psr/http-factory 1.0.1 php-composer
|
||||
psr/http-message 1.0.1 php-composer
|
||||
psr/log 1.1.4 php-composer
|
||||
psr/simple-cache 1.0.1 php-composer
|
||||
psy/psysh v0.11.9 php-composer
|
||||
ralouphie/getallheaders 3.0.3 php-composer
|
||||
ramsey/collection 1.2.2 php-composer
|
||||
ramsey/uuid 4.2.3 php-composer
|
||||
readline 8.2.0-r0 apk
|
||||
scanelf 1.3.5-r1 apk
|
||||
sebastian/cli-parser 1.0.1 php-composer
|
||||
sebastian/code-unit 1.0.8 php-composer
|
||||
sebastian/code-unit-reverse-lookup 2.0.3 php-composer
|
||||
sebastian/comparator 4.0.8 php-composer
|
||||
sebastian/complexity 2.0.2 php-composer
|
||||
sebastian/diff 4.0.4 php-composer
|
||||
sebastian/environment 5.1.4 php-composer
|
||||
sebastian/exporter 4.0.5 php-composer
|
||||
sebastian/global-state 5.0.5 php-composer
|
||||
sebastian/lines-of-code 1.0.3 php-composer
|
||||
sebastian/object-enumerator 4.0.4 php-composer
|
||||
sebastian/object-reflector 2.0.4 php-composer
|
||||
sebastian/recursion-context 4.0.4 php-composer
|
||||
sebastian/resource-operations 3.0.3 php-composer
|
||||
sebastian/type 3.2.0 php-composer
|
||||
sebastian/version 3.0.2 php-composer
|
||||
shadow 4.13-r0 apk
|
||||
skalibs 2.12.0.1-r0 apk
|
||||
sqlite-libs 3.40.1-r0 apk
|
||||
squizlabs/php_codesniffer 3.7.1 php-composer
|
||||
ssl_client 1.35.0-r29 apk
|
||||
swiftmailer/swiftmailer v6.3.0 php-composer
|
||||
symfony/cache v5.4.15 php-composer
|
||||
symfony/cache-contracts v2.5.2 php-composer
|
||||
symfony/console v5.4.15 php-composer
|
||||
symfony/css-selector v5.4.11 php-composer
|
||||
symfony/deprecation-contracts v2.5.2 php-composer
|
||||
symfony/error-handler v5.4.15 php-composer
|
||||
symfony/event-dispatcher v5.4.9 php-composer
|
||||
symfony/event-dispatcher-contracts v2.5.2 php-composer
|
||||
symfony/finder v5.4.11 php-composer
|
||||
symfony/http-foundation v5.4.15 php-composer
|
||||
symfony/http-kernel v5.4.15 php-composer
|
||||
symfony/mime v5.4.14 php-composer
|
||||
symfony/options-resolver v5.4.11 php-composer
|
||||
symfony/polyfill-ctype v1.27.0 php-composer
|
||||
symfony/polyfill-iconv v1.27.0 php-composer
|
||||
symfony/polyfill-intl-grapheme v1.27.0 php-composer
|
||||
symfony/polyfill-intl-idn v1.27.0 php-composer
|
||||
symfony/polyfill-intl-normalizer v1.27.0 php-composer
|
||||
symfony/polyfill-mbstring v1.27.0 php-composer
|
||||
symfony/polyfill-php72 v1.27.0 php-composer
|
||||
symfony/polyfill-php73 v1.27.0 php-composer
|
||||
symfony/polyfill-php80 v1.27.0 php-composer
|
||||
symfony/polyfill-php81 v1.27.0 php-composer
|
||||
symfony/process v5.4.11 php-composer
|
||||
symfony/routing v5.4.15 php-composer
|
||||
symfony/service-contracts v2.5.2 php-composer
|
||||
symfony/string v5.4.15 php-composer
|
||||
symfony/thanks v1.2.10 php-composer
|
||||
symfony/translation v5.4.14 php-composer
|
||||
symfony/translation-contracts v2.5.2 php-composer
|
||||
symfony/var-dumper v5.4.14 php-composer
|
||||
symfony/var-exporter v5.4.10 php-composer
|
||||
symfony/yaml v5.4.14 php-composer
|
||||
theseer/tokenizer 1.2.1 php-composer
|
||||
tijsverkoyen/css-to-inline-styles 2.2.5 php-composer
|
||||
tzdata 2023c-r0 apk
|
||||
utmps-libs 0.1.2.0-r1 apk
|
||||
vlucas/phpdotenv v5.5.0 php-composer
|
||||
voku/portable-ascii 1.6.1 php-composer
|
||||
webmozart/assert 1.11.0 php-composer
|
||||
xz 5.2.9-r0 apk
|
||||
xz-libs 5.2.9-r0 apk
|
||||
zlib 1.2.13-r0 apk
|
||||
zstd-libs 1.5.5-r0 apk
|
||||
NAME VERSION TYPE
|
||||
Reads from stdin without leaking info to the terminal and outputs back to stdout 1, 0, 0, 0 dotnet
|
||||
alpine-baselayout 3.4.3-r1 apk
|
||||
alpine-baselayout-data 3.4.3-r1 apk
|
||||
alpine-keys 2.4-r1 apk
|
||||
alpine-release 3.18.3-r0 apk
|
||||
apache2-utils 2.4.57-r3 apk
|
||||
apk-tools 2.14.0-r2 apk
|
||||
apr 1.7.4-r0 apk
|
||||
apr-util 1.6.3-r1 apk
|
||||
argon2-libs 20190702-r4 apk
|
||||
barryvdh/laravel-ide-helper v2.12.3 php-composer
|
||||
barryvdh/reflection-docblock v2.1.0 php-composer
|
||||
bash 5.2.15-r5 apk
|
||||
brick/math 0.9.3 php-composer
|
||||
brotli-libs 1.0.9-r14 apk
|
||||
busybox 1.36.1-r2 apk
|
||||
busybox-binsh 1.36.1-r2 apk
|
||||
ca-certificates 20230506-r0 apk
|
||||
ca-certificates-bundle 20230506-r0 apk
|
||||
clue/stream-filter v1.6.0 php-composer
|
||||
composer/pcre 3.1.0 php-composer
|
||||
coreutils 9.3-r1 apk
|
||||
curl 8.2.1-r0 apk
|
||||
dflydev/dot-access-data v3.0.2 php-composer
|
||||
doctrine/cache 2.2.0 php-composer
|
||||
doctrine/dbal 3.5.1 php-composer
|
||||
doctrine/deprecations v1.0.0 php-composer
|
||||
doctrine/event-manager 1.2.0 php-composer
|
||||
doctrine/inflector 2.0.6 php-composer
|
||||
doctrine/instantiator 1.4.1 php-composer
|
||||
doctrine/lexer 1.2.3 php-composer
|
||||
dragonmantank/cron-expression v3.3.2 php-composer
|
||||
egulias/email-validator 2.1.25 php-composer
|
||||
facade/flare-client-php 1.10.0 php-composer
|
||||
facade/ignition 2.17.6 php-composer
|
||||
facade/ignition-contracts 1.0.2 php-composer
|
||||
fideloper/proxy 4.4.2 php-composer
|
||||
filp/whoops 2.14.6 php-composer
|
||||
fzaninotto/faker v1.9.2 php-composer
|
||||
git 2.40.1-r0 apk
|
||||
graham-campbell/bounded-cache v1.3.0 php-composer
|
||||
graham-campbell/github v10.6.0 php-composer
|
||||
graham-campbell/manager v4.7.0 php-composer
|
||||
graham-campbell/result-type v1.1.0 php-composer
|
||||
guzzlehttp/guzzle 7.5.0 php-composer
|
||||
guzzlehttp/promises 1.5.2 php-composer
|
||||
guzzlehttp/psr7 2.4.3 php-composer
|
||||
hamcrest/hamcrest-php v2.0.1 php-composer
|
||||
icu-data-en 73.2-r2 apk
|
||||
icu-libs 73.2-r2 apk
|
||||
jq 1.6-r3 apk
|
||||
knplabs/github-api v3.6.0 php-composer
|
||||
laravel/framework v8.83.26 php-composer
|
||||
laravel/serializable-closure v1.2.2 php-composer
|
||||
laravel/tinker v2.7.3 php-composer
|
||||
laravel/ui v3.4.6 php-composer
|
||||
laravelcollective/html v6.3.0 php-composer
|
||||
league/commonmark 2.3.7 php-composer
|
||||
league/config v1.1.1 php-composer
|
||||
league/flysystem 1.1.10 php-composer
|
||||
league/mime-type-detection 1.11.0 php-composer
|
||||
libacl 2.3.1-r3 apk
|
||||
libattr 2.5.1-r4 apk
|
||||
libbsd 0.11.7-r1 apk
|
||||
libbz2 1.0.8-r5 apk
|
||||
libc-utils 0.7.2-r5 apk
|
||||
libcrypto3 3.1.2-r0 apk
|
||||
libcurl 8.2.1-r0 apk
|
||||
libedit 20221030.3.1-r1 apk
|
||||
libexpat 2.5.0-r1 apk
|
||||
libgcc 12.2.1_git20220924-r10 apk
|
||||
libidn2 2.3.4-r1 apk
|
||||
libintl 0.21.1-r7 apk
|
||||
libmd 1.0.4-r2 apk
|
||||
libncursesw 6.4_p20230506-r0 apk
|
||||
libpq 15.4-r0 apk
|
||||
libproc2 4.0.3-r1 apk
|
||||
libssl3 3.1.2-r0 apk
|
||||
libstdc++ 12.2.1_git20220924-r10 apk
|
||||
libunistring 1.1-r1 apk
|
||||
libuuid 2.38.1-r8 apk
|
||||
libxml2 2.11.4-r0 apk
|
||||
libzip 1.9.2-r2 apk
|
||||
linux-pam 1.5.2-r10 apk
|
||||
logrotate 3.21.0-r1 apk
|
||||
mockery/mockery 1.5.1 php-composer
|
||||
monolog/monolog 2.8.0 php-composer
|
||||
musl 1.2.4-r1 apk
|
||||
musl-utils 1.2.4-r1 apk
|
||||
myclabs/deep-copy 1.11.0 php-composer
|
||||
nano 7.2-r1 apk
|
||||
ncurses-terminfo-base 6.4_p20230506-r0 apk
|
||||
nesbot/carbon 2.63.0 php-composer
|
||||
netcat-openbsd 1.219-r1 apk
|
||||
nette/schema v1.2.3 php-composer
|
||||
nette/utils v3.2.8 php-composer
|
||||
nghttp2-libs 1.55.1-r0 apk
|
||||
nginx 1.24.0-r6 apk
|
||||
nikic/php-parser v4.15.2 php-composer
|
||||
nunomaduro/collision v5.11.0 php-composer
|
||||
oniguruma 6.9.8-r1 apk
|
||||
openssl 3.1.2-r0 apk
|
||||
opis/closure 3.6.3 php-composer
|
||||
pcre 8.45-r3 apk
|
||||
pcre2 10.42-r1 apk
|
||||
phar-io/manifest 2.0.3 php-composer
|
||||
phar-io/version 3.2.1 php-composer
|
||||
php-http/cache-plugin 1.7.5 php-composer
|
||||
php-http/client-common 2.6.0 php-composer
|
||||
php-http/discovery 1.14.3 php-composer
|
||||
php-http/httplug 2.3.0 php-composer
|
||||
php-http/message 1.13.0 php-composer
|
||||
php-http/message-factory v1.0.2 php-composer
|
||||
php-http/multipart-stream-builder 1.2.0 php-composer
|
||||
php-http/promise 1.1.0 php-composer
|
||||
php82 8.2.8-r0 apk
|
||||
php82-common 8.2.8-r0 apk
|
||||
php82-ctype 8.2.8-r0 apk
|
||||
php82-curl 8.2.8-r0 apk
|
||||
php82-fileinfo 8.2.8-r0 apk
|
||||
php82-fpm 8.2.8-r0 apk
|
||||
php82-iconv 8.2.8-r0 apk
|
||||
php82-intl 8.2.8-r0 apk
|
||||
php82-mbstring 8.2.8-r0 apk
|
||||
php82-mysqlnd 8.2.8-r0 apk
|
||||
php82-openssl 8.2.8-r0 apk
|
||||
php82-pdo 8.2.8-r0 apk
|
||||
php82-pdo_mysql 8.2.8-r0 apk
|
||||
php82-pdo_pgsql 8.2.8-r0 apk
|
||||
php82-pdo_sqlite 8.2.8-r0 apk
|
||||
php82-phar 8.2.8-r0 apk
|
||||
php82-session 8.2.8-r0 apk
|
||||
php82-simplexml 8.2.8-r0 apk
|
||||
php82-tokenizer 8.2.8-r0 apk
|
||||
php82-xml 8.2.8-r0 apk
|
||||
php82-xmlwriter 8.2.8-r0 apk
|
||||
php82-zip 8.2.8-r0 apk
|
||||
phpdocumentor/reflection-common 2.2.0 php-composer
|
||||
phpdocumentor/type-resolver 1.6.2 php-composer
|
||||
phpoption/phpoption 1.9.0 php-composer
|
||||
phpunit/php-code-coverage 9.2.19 php-composer
|
||||
phpunit/php-file-iterator 3.0.6 php-composer
|
||||
phpunit/php-invoker 3.1.1 php-composer
|
||||
phpunit/php-text-template 2.0.4 php-composer
|
||||
phpunit/php-timer 5.0.3 php-composer
|
||||
phpunit/phpunit 9.5.26 php-composer
|
||||
popt 1.19-r2 apk
|
||||
procps-ng 4.0.3-r1 apk
|
||||
psr/cache 1.0.1 php-composer
|
||||
psr/container 1.1.2 php-composer
|
||||
psr/event-dispatcher 1.0.0 php-composer
|
||||
psr/http-client 1.0.1 php-composer
|
||||
psr/http-factory 1.0.1 php-composer
|
||||
psr/http-message 1.0.1 php-composer
|
||||
psr/log 1.1.4 php-composer
|
||||
psr/simple-cache 1.0.1 php-composer
|
||||
psy/psysh v0.11.9 php-composer
|
||||
ralouphie/getallheaders 3.0.3 php-composer
|
||||
ramsey/collection 1.2.2 php-composer
|
||||
ramsey/uuid 4.2.3 php-composer
|
||||
readline 8.2.1-r1 apk
|
||||
scanelf 1.3.7-r1 apk
|
||||
sebastian/cli-parser 1.0.1 php-composer
|
||||
sebastian/code-unit 1.0.8 php-composer
|
||||
sebastian/code-unit-reverse-lookup 2.0.3 php-composer
|
||||
sebastian/comparator 4.0.8 php-composer
|
||||
sebastian/complexity 2.0.2 php-composer
|
||||
sebastian/diff 4.0.4 php-composer
|
||||
sebastian/environment 5.1.4 php-composer
|
||||
sebastian/exporter 4.0.5 php-composer
|
||||
sebastian/global-state 5.0.5 php-composer
|
||||
sebastian/lines-of-code 1.0.3 php-composer
|
||||
sebastian/object-enumerator 4.0.4 php-composer
|
||||
sebastian/object-reflector 2.0.4 php-composer
|
||||
sebastian/recursion-context 4.0.4 php-composer
|
||||
sebastian/resource-operations 3.0.3 php-composer
|
||||
sebastian/type 3.2.0 php-composer
|
||||
sebastian/version 3.0.2 php-composer
|
||||
shadow 4.13-r4 apk
|
||||
skalibs 2.13.1.1-r1 apk
|
||||
sqlite-libs 3.41.2-r2 apk
|
||||
squizlabs/php_codesniffer 3.7.1 php-composer
|
||||
ssl_client 1.36.1-r2 apk
|
||||
swiftmailer/swiftmailer v6.3.0 php-composer
|
||||
symfony/cache v5.4.15 php-composer
|
||||
symfony/cache-contracts v2.5.2 php-composer
|
||||
symfony/console v5.4.15 php-composer
|
||||
symfony/css-selector v5.4.11 php-composer
|
||||
symfony/deprecation-contracts v2.5.2 php-composer
|
||||
symfony/error-handler v5.4.15 php-composer
|
||||
symfony/event-dispatcher v5.4.9 php-composer
|
||||
symfony/event-dispatcher-contracts v2.5.2 php-composer
|
||||
symfony/finder v5.4.11 php-composer
|
||||
symfony/http-foundation v5.4.15 php-composer
|
||||
symfony/http-kernel v5.4.15 php-composer
|
||||
symfony/mime v5.4.14 php-composer
|
||||
symfony/options-resolver v5.4.11 php-composer
|
||||
symfony/polyfill-ctype v1.27.0 php-composer
|
||||
symfony/polyfill-iconv v1.27.0 php-composer
|
||||
symfony/polyfill-intl-grapheme v1.27.0 php-composer
|
||||
symfony/polyfill-intl-idn v1.27.0 php-composer
|
||||
symfony/polyfill-intl-normalizer v1.27.0 php-composer
|
||||
symfony/polyfill-mbstring v1.27.0 php-composer
|
||||
symfony/polyfill-php72 v1.27.0 php-composer
|
||||
symfony/polyfill-php73 v1.27.0 php-composer
|
||||
symfony/polyfill-php80 v1.27.0 php-composer
|
||||
symfony/polyfill-php81 v1.27.0 php-composer
|
||||
symfony/process v5.4.11 php-composer
|
||||
symfony/routing v5.4.15 php-composer
|
||||
symfony/service-contracts v2.5.2 php-composer
|
||||
symfony/string v5.4.15 php-composer
|
||||
symfony/thanks v1.2.10 php-composer
|
||||
symfony/translation v5.4.14 php-composer
|
||||
symfony/translation-contracts v2.5.2 php-composer
|
||||
symfony/var-dumper v5.4.14 php-composer
|
||||
symfony/var-exporter v5.4.10 php-composer
|
||||
symfony/yaml v5.4.14 php-composer
|
||||
theseer/tokenizer 1.2.1 php-composer
|
||||
tijsverkoyen/css-to-inline-styles 2.2.5 php-composer
|
||||
tzdata 2023c-r1 apk
|
||||
utmps-libs 0.1.2.1-r1 apk
|
||||
vlucas/phpdotenv v5.5.0 php-composer
|
||||
voku/portable-ascii 1.6.1 php-composer
|
||||
webmozart/assert 1.11.0 php-composer
|
||||
xz-libs 5.4.3-r0 apk
|
||||
zlib 1.2.13-r1 apk
|
||||
zstd-libs 1.5.5-r4 apk
|
||||
|
||||
@@ -16,7 +16,6 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
|
||||
available_architectures:
|
||||
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
|
||||
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
|
||||
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
|
||||
|
||||
# development version
|
||||
development_versions: true
|
||||
@@ -59,6 +58,8 @@ app_setup_block: |
|
||||
|
||||
# changelog
|
||||
changelogs:
|
||||
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
|
||||
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
|
||||
- { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
|
||||
- { date: "14.11.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: "04.11.22:", desc: "Build commits to upstream branch 2.x." }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
## Version 2022/11/14 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||
|
||||
server {
|
||||
listen 80 default_server;
|
||||
@@ -9,6 +9,8 @@ server {
|
||||
|
||||
server_name _;
|
||||
|
||||
include /config/nginx/ssl.conf;
|
||||
|
||||
root /app/www/public;
|
||||
index index.html index.htm index.php;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user