OpenHAB
/
openhab-docker
mirror of https://github.com/openhab/openhab-docker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use JFrog URLs (#407) 

Signed-off-by: Wouter Born <github@maindrain.net>
pull/410/head
Wouter Born 2022-10-09 22:11:55 +02:00 committed by GitHub
parent 5d705ac14e
commit 661685c6d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alpine/Dockerfile
View File

@ -67,9 +67,9 @@ RUN JAVA_HOME=$(ls -d /usr/lib/jvm/*jdk*) && \
# Install openHAB # Install openHAB
# Set permissions for openHAB. Export TERM variable. See issue #30 for details! # Set permissions for openHAB. Export TERM variable. See issue #30 for details!
RUN version="$(echo $OPENHAB_VERSION | sed 's/snapshot/SNAPSHOT/g')" && \ RUN version="$(echo $OPENHAB_VERSION | sed 's/snapshot/SNAPSHOT/g')" && \
if [ $(echo $version | grep -E '^.+\.(M|RC).+$') ]; then url="https://www.openhab.org/download/milestones/org/openhab/distro/openhab/${version}/openhab-${version}.zip"; \ if [ $(echo $version | grep -E '^.+\.(M|RC).+$') ]; then url="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/${version}/openhab-${version}.zip"; \
elif [ $(echo $version | grep -E '^3\..+-SNAPSHOT$') ]; then url="https://ci.openhab.org/job/openHAB3-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-${version}.zip"; \ elif [ $(echo $version | grep -E '^3\..+-SNAPSHOT$') ]; then url="https://ci.openhab.org/job/openHAB3-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-${version}.zip"; \
else url="https://www.openhab.org/download/releases/org/openhab/distro/openhab/${version}/openhab-${version}.zip"; fi && \ else url="https://openhab.jfrog.io/openhab/libs-release/org/openhab/distro/openhab/${version}/openhab-${version}.zip"; fi && \
wget -nv -O /tmp/openhab.zip "$url" && \ wget -nv -O /tmp/openhab.zip "$url" && \
unzip -q /tmp/openhab.zip -d "${OPENHAB_HOME}" -x "*.bat" "*.ps1" "*.psm1" && \ unzip -q /tmp/openhab.zip -d "${OPENHAB_HOME}" -x "*.bat" "*.ps1" "*.psm1" && \
rm /tmp/openhab.zip && \ rm /tmp/openhab.zip && \

4
alpine/update
View File

@ -18,9 +18,9 @@ setup() {
echo "You are already on openHAB $current_version" >&2 echo "You are already on openHAB $current_version" >&2
exit 1 exit 1
elif [ -n "$milestone_version" ]; then elif [ -n "$milestone_version" ]; then
addons_download_location="https://www.openhab.org/download/milestones/org/openhab/distro/openhab-addons/${oh_version}/openhab-addons-${oh_version}.kar" addons_download_location="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab-addons/${oh_version}/openhab-addons-${oh_version}.kar"
else else
addons_download_location="https://www.openhab.org/download/releases/org/openhab/distro/openhab-addons/${oh_version}/openhab-addons-${oh_version}.kar" addons_download_location="https://openhab.jfrog.io/openhab/libs-release/org/openhab/distro/openhab-addons/${oh_version}/openhab-addons-${oh_version}.kar"
fi fi
} }

4
debian/Dockerfile vendored
View File

@ -77,9 +77,9 @@ RUN wget -nv -O - https://packages.adoptium.net/artifactory/api/gpg/key/public |
# Install openHAB # Install openHAB
# Set permissions for openHAB. Export TERM variable. See issue #30 for details! # Set permissions for openHAB. Export TERM variable. See issue #30 for details!
RUN version="$(echo $OPENHAB_VERSION | sed 's/snapshot/SNAPSHOT/g')" && \ RUN version="$(echo $OPENHAB_VERSION | sed 's/snapshot/SNAPSHOT/g')" && \
if [ $(echo $version | grep -E '^.+\.(M|RC).+$') ]; then url="https://www.openhab.org/download/milestones/org/openhab/distro/openhab/${version}/openhab-${version}.zip"; \ if [ $(echo $version | grep -E '^.+\.(M|RC).+$') ]; then url="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/${version}/openhab-${version}.zip"; \
elif [ $(echo $version | grep -E '^3\..+-SNAPSHOT$') ]; then url="https://ci.openhab.org/job/openHAB3-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-${version}.zip"; \ elif [ $(echo $version | grep -E '^3\..+-SNAPSHOT$') ]; then url="https://ci.openhab.org/job/openHAB3-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-${version}.zip"; \
else url="https://www.openhab.org/download/releases/org/openhab/distro/openhab/${version}/openhab-${version}.zip"; fi && \ else url="https://openhab.jfrog.io/openhab/libs-release/org/openhab/distro/openhab/${version}/openhab-${version}.zip"; fi && \
wget -nv -O /tmp/openhab.zip "$url" && \ wget -nv -O /tmp/openhab.zip "$url" && \
unzip -q /tmp/openhab.zip -d "${OPENHAB_HOME}" -x "*.bat" "*.ps1" "*.psm1" && \ unzip -q /tmp/openhab.zip -d "${OPENHAB_HOME}" -x "*.bat" "*.ps1" "*.psm1" && \
rm /tmp/openhab.zip && \ rm /tmp/openhab.zip && \

4
debian/update vendored
View File

@ -18,9 +18,9 @@ setup() {
echo "You are already on openHAB $current_version" >&2 echo "You are already on openHAB $current_version" >&2
exit 1 exit 1
elif [ -n "$milestone_version" ]; then elif [ -n "$milestone_version" ]; then
addons_download_location="https://www.openhab.org/download/milestones/org/openhab/distro/openhab-addons/${oh_version}/openhab-addons-${oh_version}.kar" addons_download_location="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab-addons/${oh_version}/openhab-addons-${oh_version}.kar"
else else
addons_download_location="https://www.openhab.org/download/releases/org/openhab/distro/openhab-addons/${oh_version}/openhab-addons-${oh_version}.kar" addons_download_location="https://openhab.jfrog.io/openhab/libs-release/org/openhab/distro/openhab-addons/${oh_version}/openhab-addons-${oh_version}.kar"
fi fi
} }