mirror of
https://github.com/linuxserver/docker-unifi-network-application.git
synced 2024-11-09 23:24:08 -08:00
Merge pull request #71 from sturman/use-https
Use `https` in download URL
This commit is contained in:
commit
42106cd600
2
.github/workflows/external_trigger.yml
vendored
2
.github/workflows/external_trigger.yml
vendored
|
@ -20,7 +20,7 @@ jobs:
|
||||||
echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\". ****"
|
echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\". ****"
|
||||||
echo "External trigger running off of main branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\`" >> $GITHUB_STEP_SUMMARY
|
echo "External trigger running off of main branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\`" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "**** Retrieving external version ****"
|
echo "**** Retrieving external version ****"
|
||||||
EXT_RELEASE=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}')
|
EXT_RELEASE=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}')
|
||||||
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
|
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
|
||||||
echo "**** Can't retrieve external version, exiting ****"
|
echo "**** Can't retrieve external version, exiting ****"
|
||||||
FAILURE_REASON="Can't retrieve external version for unifi-network-application branch main"
|
FAILURE_REASON="Can't retrieve external version for unifi-network-application branch main"
|
||||||
|
|
|
@ -10,8 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||||
LABEL maintainer="thespad"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ARG UNIFI_BRANCH="stable" \
|
ARG UNIFI_BRANCH="stable"
|
||||||
DEBIAN_FRONTEND="noninteractive"
|
ENV DEBIAN_FRONTEND="noninteractive"
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
|
@ -23,7 +23,7 @@ RUN \
|
||||||
unzip && \
|
unzip && \
|
||||||
echo "**** install unifi ****" && \
|
echo "**** install unifi ****" && \
|
||||||
if [ -z ${UNIFI_VERSION+x} ]; then \
|
if [ -z ${UNIFI_VERSION+x} ]; then \
|
||||||
UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
|
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
|
||||||
|grep -A 7 -m 1 'Package: unifi' \
|
|grep -A 7 -m 1 'Package: unifi' \
|
||||||
| awk -F ': ' '/Version/{print $2;exit}' \
|
| awk -F ': ' '/Version/{print $2;exit}' \
|
||||||
| awk -F '-' '{print $1}'); \
|
| awk -F '-' '{print $1}'); \
|
||||||
|
|
|
@ -10,8 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
|
||||||
LABEL maintainer="thespad"
|
LABEL maintainer="thespad"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ARG UNIFI_BRANCH="stable" \
|
ARG UNIFI_BRANCH="stable"
|
||||||
DEBIAN_FRONTEND="noninteractive"
|
ENV DEBIAN_FRONTEND="noninteractive"
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
|
@ -23,7 +23,7 @@ RUN \
|
||||||
unzip && \
|
unzip && \
|
||||||
echo "**** install unifi ****" && \
|
echo "**** install unifi ****" && \
|
||||||
if [ -z ${UNIFI_VERSION+x} ]; then \
|
if [ -z ${UNIFI_VERSION+x} ]; then \
|
||||||
UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
|
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
|
||||||
|grep -A 7 -m 1 'Package: unifi' \
|
|grep -A 7 -m 1 'Package: unifi' \
|
||||||
| awk -F ': ' '/Version/{print $2;exit}' \
|
| awk -F ': ' '/Version/{print $2;exit}' \
|
||||||
| awk -F '-' '{print $1}'); \
|
| awk -F '-' '{print $1}'); \
|
||||||
|
|
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
|
@ -115,7 +115,7 @@ pipeline {
|
||||||
steps{
|
steps{
|
||||||
script{
|
script{
|
||||||
env.EXT_RELEASE = sh(
|
env.EXT_RELEASE = sh(
|
||||||
script: ''' curl -sX GET http://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''',
|
script: ''' curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''',
|
||||||
returnStdout: true).trim()
|
returnStdout: true).trim()
|
||||||
env.RELEASE_LINK = 'custom_command'
|
env.RELEASE_LINK = 'custom_command'
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# jenkins variables
|
# jenkins variables
|
||||||
project_name: unifi-network-application
|
project_name: unifi-network-application
|
||||||
external_type: na
|
external_type: na
|
||||||
custom_version_command: "curl -sX GET http://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}'"
|
custom_version_command: "curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}'"
|
||||||
release_type: stable
|
release_type: stable
|
||||||
release_tag: latest
|
release_tag: latest
|
||||||
ls_branch: main
|
ls_branch: main
|
||||||
|
|
Loading…
Reference in a new issue