[ARVADOS] updated: 1.3.2-2-gfbbe70d89
Git user
git at public.curoverse.com
Wed May 1 19:54:13 UTC 2019
Summary of changes:
.licenseignore | 3 +-
build/run-build-docker-jobs-image.sh | 48 +++++++++++++++-------
docker/jobs/Dockerfile | 14 +++++--
...t.arvados.org.list => apt.arvados.org-dev.list} | 0
docker/jobs/apt.arvados.org-stable.list | 2 +
docker/jobs/apt.arvados.org-testing.list | 2 +
6 files changed, 50 insertions(+), 19 deletions(-)
rename docker/jobs/{apt.arvados.org.list => apt.arvados.org-dev.list} (100%)
create mode 100644 docker/jobs/apt.arvados.org-stable.list
create mode 100644 docker/jobs/apt.arvados.org-testing.list
via fbbe70d89471efca8813b31739ebefbe44bd0c28 (commit)
from 675237bec9e6ecf768b63504b20e58162ff5352d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit fbbe70d89471efca8813b31739ebefbe44bd0c28
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date: Wed May 1 15:53:15 2019 -0400
Add argument to the arvados/jobs build script to choose which package repo to
build from.
No issue #
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>
diff --git a/.licenseignore b/.licenseignore
index 83c81b2fc..b62364bb1 100644
--- a/.licenseignore
+++ b/.licenseignore
@@ -15,7 +15,8 @@ build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados
doc/fonts/*
doc/user/cwl/federated/*
*/docker_image
-docker/jobs/apt.arvados.org.list
+docker/jobs/apt.arvados.org*.list
+docker/jobs/1078ECD7.key
*/en.bootstrap.yml
*font-awesome.css
*.gif
diff --git a/build/run-build-docker-jobs-image.sh b/build/run-build-docker-jobs-image.sh
index 83bb5ae71..5f774ce76 100755
--- a/build/run-build-docker-jobs-image.sh
+++ b/build/run-build-docker-jobs-image.sh
@@ -5,21 +5,24 @@
function usage {
echo >&2
- echo >&2 "usage: $0 [options]"
+ echo >&2 "usage: WORKSPACE=/path/to/arvados $0 [options]"
echo >&2
echo >&2 "$0 options:"
echo >&2 " -t, --tags version tag for docker"
+ echo >&2 " -r, --repo Arvados package repo to use: dev, testing, stable (default: dev)"
echo >&2 " -u, --upload Upload the images (docker push)"
echo >&2 " --no-cache Don't use build cache"
echo >&2 " -h, --help Display this help and exit"
echo >&2
- echo >&2 " If no options are given, just builds the images."
+ echo >&2 " WORKSPACE=path Path to the Arvados source tree to build from"
+ echo >&2
}
upload=false
+REPO=dev
# NOTE: This requires GNU getopt (part of the util-linux package on Debian-based distros).
-TEMP=`getopt -o hut: \
- --long help,upload,no-cache,tags: \
+TEMP=`getopt -o hut:r: \
+ --long help,upload,no-cache,tags:,repo: \
-n "$0" -- "$@"`
if [ $? != 0 ] ; then echo "Use -h for help"; exit 1 ; fi
@@ -50,6 +53,19 @@ do
;;
esac
;;
+ -r | --repo)
+ case "$2" in
+ "")
+ echo "ERROR: --repo needs a parameter";
+ usage;
+ exit 1
+ ;;
+ *)
+ REPO="$2";
+ shift 2
+ ;;
+ esac
+ ;;
--)
shift
break
@@ -69,6 +85,16 @@ exit_cleanly() {
exit $EXITCODE
}
+# Sanity check
+if ! [[ -n "$WORKSPACE" ]]; then
+ usage;
+ echo >&2 "Error: WORKSPACE environment variable not set"
+ echo >&2
+ exit 1
+fi
+
+echo $WORKSPACE
+
COLUMNS=80
. $WORKSPACE/build/run-library.sh
@@ -88,16 +114,6 @@ docker_push () {
checkexit $ECODE "docker push $*"
}
-# Sanity check
-if ! [[ -n "$WORKSPACE" ]]; then
- echo >&2
- echo >&2 "Error: WORKSPACE environment variable not set"
- echo >&2
- exit 1
-fi
-
-echo $WORKSPACE
-
# find the docker binary
DOCKER=`which docker.io`
@@ -153,6 +169,7 @@ cd docker/jobs
docker build $NOCACHE \
--build-arg python_sdk_version=${python_sdk_version} \
--build-arg cwl_runner_version=${cwl_runner_version} \
+ --build-arg repo_version=${REPO} \
-t arvados/jobs:$cwl_runner_version_orig .
ECODE=$?
@@ -175,6 +192,9 @@ if docker --version |grep " 1\.[0-9]\." ; then
# -f flag removed in Docker 1.12
FORCE=-f
fi
+
+#docker export arvados/jobs:$cwl_runner_version_orig | docker import - arvados/jobs:$cwl_runner_version_orig
+
if ! [[ -z "$version_tag" ]]; then
docker tag $FORCE arvados/jobs:$cwl_runner_version_orig arvados/jobs:"$version_tag"
else
diff --git a/docker/jobs/Dockerfile b/docker/jobs/Dockerfile
index 12c68564b..c7bcf988d 100644
--- a/docker/jobs/Dockerfile
+++ b/docker/jobs/Dockerfile
@@ -4,13 +4,19 @@
# Based on Debian Jessie
FROM debian:jessie
-MAINTAINER Ward Vandewege <ward at curoverse.com>
+MAINTAINER Ward Vandewege <wvandewege at veritasgenetics.com>
ENV DEBIAN_FRONTEND noninteractive
-ADD apt.arvados.org.list /etc/apt/sources.list.d/
-RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3
+RUN apt-get update -q
+RUN apt-get install -yq --no-install-recommends gnupg
+
+ARG repo_version
+RUN echo repo_version $repo_version
+ADD apt.arvados.org-$repo_version.list /etc/apt/sources.list.d/
+
+ADD 1078ECD7.key /tmp/
+RUN cat /tmp/1078ECD7.key | apt-key add -
ARG python_sdk_version
ARG cwl_runner_version
diff --git a/docker/jobs/apt.arvados.org.list b/docker/jobs/apt.arvados.org-dev.list
similarity index 100%
rename from docker/jobs/apt.arvados.org.list
rename to docker/jobs/apt.arvados.org-dev.list
diff --git a/docker/jobs/apt.arvados.org-stable.list b/docker/jobs/apt.arvados.org-stable.list
new file mode 100644
index 000000000..3ae6df421
--- /dev/null
+++ b/docker/jobs/apt.arvados.org-stable.list
@@ -0,0 +1,2 @@
+# apt.arvados.org
+deb http://apt.arvados.org/ jessie main
diff --git a/docker/jobs/apt.arvados.org-testing.list b/docker/jobs/apt.arvados.org-testing.list
new file mode 100644
index 000000000..27b3e0bc1
--- /dev/null
+++ b/docker/jobs/apt.arvados.org-testing.list
@@ -0,0 +1,2 @@
+# apt.arvados.org
+deb http://apt.arvados.org/ jessie-testing main
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list