Skip to content

Commit 42106cd

Browse files
authored
Merge pull request #71 from sturman/use-https
Use `https` in download URL
2 parents 286ca23 + 21494a2 commit 42106cd

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_UNIFI_NETWORK_APPLICATION_MAIN\". ****"
2121
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
2222
echo "**** Retrieving external version ****"
23-
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}')
23+
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}')
2424
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2525
echo "**** Can't retrieve external version, exiting ****"
2626
FAILURE_REASON="Can't retrieve external version for unifi-network-application branch main"

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1010
LABEL maintainer="thespad"
1111

1212
# environment settings
13-
ARG UNIFI_BRANCH="stable" \
14-
DEBIAN_FRONTEND="noninteractive"
13+
ARG UNIFI_BRANCH="stable"
14+
ENV DEBIAN_FRONTEND="noninteractive"
1515

1616
RUN \
1717
echo "**** install packages ****" && \
@@ -23,7 +23,7 @@ RUN \
2323
unzip && \
2424
echo "**** install unifi ****" && \
2525
if [ -z ${UNIFI_VERSION+x} ]; then \
26-
UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
26+
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
2727
|grep -A 7 -m 1 'Package: unifi' \
2828
| awk -F ': ' '/Version/{print $2;exit}' \
2929
| awk -F '-' '{print $1}'); \

Dockerfile.aarch64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1010
LABEL maintainer="thespad"
1111

1212
# environment settings
13-
ARG UNIFI_BRANCH="stable" \
14-
DEBIAN_FRONTEND="noninteractive"
13+
ARG UNIFI_BRANCH="stable"
14+
ENV DEBIAN_FRONTEND="noninteractive"
1515

1616
RUN \
1717
echo "**** install packages ****" && \
@@ -23,7 +23,7 @@ RUN \
2323
unzip && \
2424
echo "**** install unifi ****" && \
2525
if [ -z ${UNIFI_VERSION+x} ]; then \
26-
UNIFI_VERSION=$(curl -sX GET http://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
26+
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
2727
|grep -A 7 -m 1 'Package: unifi' \
2828
| awk -F ': ' '/Version/{print $2;exit}' \
2929
| awk -F '-' '{print $1}'); \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pipeline {
115115
steps{
116116
script{
117117
env.EXT_RELEASE = sh(
118-
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}' ''',
118+
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}' ''',
119119
returnStdout: true).trim()
120120
env.RELEASE_LINK = 'custom_command'
121121
}

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: unifi-network-application
55
external_type: na
6-
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}'"
6+
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}'"
77
release_type: stable
88
release_tag: latest
99
ls_branch: main

0 commit comments

Comments
 (0)