Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ingest version from new source, do not use at buildtime #6

Merged
merged 1 commit into from
Oct 17, 2020
Merged

ingest version from new source, do not use at buildtime #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,22 @@ LABEL maintainer="aptalca"
ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"

# global environment settings
ENV DEBIAN_FRONTEND="noninteractive"
ENV DEBIAN_FRONTEND="noninteractive" \
MAJOR_VERSION=7.6

RUN \
echo "**** install runtime packages ****" && \
apt-get update && \
apt-get install -y \
libnvidia-compute-435 \
jq \
ocl-icd-libopencl1 && \
ln -s libOpenCL.so.1 /usr/lib/x86_64-linux-gnu/libOpenCL.so && \
echo "**** install foldingathome ****" && \
if [ -z ${FOLDINGATHOME_RELEASE+x} ]; then \
FOLDINGATHOME_RELEASE="$(curl -sL https://download.foldingathome.org/js/fah-downloads.js \
| awk -F'(fahclient_|_amd64.deb)' '/debian-stable-64bit/ {print $2;exit}')"; \
fi && \
MAJOR_VERSION="$(curl -sL https://download.foldingathome.org/js/fah-downloads.js \
| awk -F'(/debian-stable-64bit/|/fahclient_)' '/debian-stable-64bit/ {print $2;exit}')" && \
download_url=$(curl -sL https://download.foldingathome.org/releases.py?series=${MAJOR_VERSION} | jq -r '.[] | select(.title=="64bit Linux") | .groups[0].files[0].url') && \
curl -o \
/tmp/fah.deb -L \
"https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/${MAJOR_VERSION}/fahclient_${FOLDINGATHOME_RELEASE}_amd64.deb" && \
${download_url} && \
dpkg -x /tmp/fah.deb /app && \
echo "**** cleanup ****" && \
apt-get clean && \
Expand Down
3 changes: 2 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ pipeline {
steps{
script{
env.EXT_RELEASE = sh(
script: ''' curl -sL https://download.foldingathome.org/js/fah-downloads.js | awk -F'(fahclient_|_amd64.deb)' '/debian-stable-64bit/ {print $2;exit}' ''',
script: ''' curl -sL https://download.foldingathome.org/releases.py?series=7.6 | jq -r '.[] | select(.title=="64bit Linux") | .groups[0].files[0].filename' | awk -F'(fahclient_|_amd64.deb)' '{print $2}'
''',
returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command'
}
Expand Down
3 changes: 2 additions & 1 deletion jenkins-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
# jenkins variables
project_name: docker-foldingathome
external_type: na
custom_version_command: "curl -sL https://download.foldingathome.org/js/fah-downloads.js | awk -F'(fahclient_|_amd64.deb)' '/debian-stable-64bit/ {print $2;exit}'"
custom_version_command: |
curl -sL https://download.foldingathome.org/releases.py?series=7.6 | jq -r '.[] | select(.title=="64bit Linux") | .groups[0].files[0].filename' | awk -F'(fahclient_|_amd64.deb)' '{print $2}'
release_type: stable
release_tag: latest
ls_branch: master
Expand Down