From f2f369dd3b4be8a353290c78991c20c9f42e3005 Mon Sep 17 00:00:00 2001 From: thespad Date: Wed, 12 Jun 2024 18:14:31 +0100 Subject: [PATCH] Copy lsiown from repo --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ jenkins-vars.yml | 5 ++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b5db0f..0f8b0a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,11 +49,13 @@ ARG BUILD_DATE ARG VERSION ARG MODS_VERSION="v3" ARG PKG_INST_VERSION="v1" +ARG LSIOWN_VERSION="v1" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 517f274..2cece52 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -49,11 +49,13 @@ ARG BUILD_DATE ARG VERSION ARG MODS_VERSION="v3" ARG PKG_INST_VERSION="v1" +ARG LSIOWN_VERSION="v1" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" # environment variables ENV PS1="$(whoami)@$(hostname):$(pwd)\\$ " \ diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a18684c..8184117 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,6 @@ custom_version_command: "echo 39" release_type: prerelease release_tag: "39" ls_branch: 39 -build_armhf: false repo_vars: - BUILD_VERSION_ARG = 'FEDORA_VERSION' - LS_USER = 'linuxserver' @@ -23,6 +22,6 @@ repo_vars: - CI_PORT='80' - CI_SSL='true' - CI_DELAY='30' - - CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true' - - CI_AUTH='user:password' + - CI_DOCKERENV='LSIO_FIRST_PARTY=true' + - CI_AUTH='' - CI_WEBPATH=''