From: Ward Vandewege Date: Wed, 27 Feb 2019 22:31:09 +0000 (-0500) Subject: Bump everything up to the latest stable release (1.3.1), and use Ubuntu 18.04 X-Git-Url: https://git.arvados.org/arvados-k8s.git/commitdiff_plain/fb1d7d0f2ae6b1ca16a8186c88d95602a0ae76c6 Bump everything up to the latest stable release (1.3.1), and use Ubuntu 18.04 as the operating system. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- diff --git a/.licenseignore b/.licenseignore index 71c0386..edc6a97 100644 --- a/.licenseignore +++ b/.licenseignore @@ -11,3 +11,4 @@ charts/arvados/templates/NOTES.txt charts/arvados/templates/_helpers.tpl charts/arvados/config/slurm/slurm.conf charts/arvados/config/slurm/munge.key +dockerfiles/1078ECD7.asc diff --git a/charts/arvados/config/slurm/slurm.conf b/charts/arvados/config/slurm/slurm.conf index 6a54969..d72ad78 100644 --- a/charts/arvados/config/slurm/slurm.conf +++ b/charts/arvados/config/slurm/slurm.conf @@ -41,9 +41,9 @@ JobAcctGatherType=jobacct_gather/none # # COMPUTE NODES NodeName=DEFAULT State=UNKNOWN -NodeName=arvados-slurm-compute-63 CPUs=32 State=UNKNOWN RealMemory=58368 Weight=58368 TmpDisk=640000 +NodeName=arvados-slurm-compute-64 CPUs=32 State=UNKNOWN RealMemory=58368 Weight=58368 TmpDisk=640000 PartitionName=DEFAULT MaxTime=INFINITE State=UP NodeName=arvados-slurm-compute-[0-63] -PartitionName=compute Nodes=arvados-slurm-compute-[0-63] Default=YES Shared=YES +PartitionName=compute Nodes=arvados-slurm-compute-[0-64] Default=YES Shared=YES diff --git a/charts/arvados/values.yaml b/charts/arvados/values.yaml index 8d767fa..fed5682 100644 --- a/charts/arvados/values.yaml +++ b/charts/arvados/values.yaml @@ -36,23 +36,23 @@ uuidPrefix: vwxyz arvados: versions: distribution: - arvadosApiServer: 1.3.0-1 - arvadosGitHttpd: 1.3.0-1 - arvadosHealth: 1.3.0-1 - arvadosWorkbench: 1.3.0-1 - arvadosWs: 1.3.0-1 + arvadosApiServer: 1.3.1-1 + arvadosGitHttpd: 1.3.1-1 + arvadosHealth: 1.3.1-1 + arvadosWorkbench: 1.3.1-1 + arvadosWs: 1.3.1-1 arvadosSSOServer: 1.1.4-1 - crunchDispatchSlurm: 1.3.0-1 - crunchRun: 1.3.0-1 - crunchRunner: 1.3.0-1 - keepBalance: 1.3.0-1 - keepStore: 1.3.0-1 - keepWeb: 1.3.0-1 - keepProxy: 1.3.0-1 - libPamArvados: 1.3.0-1 - pythonArvadosFuse: 1.3.0-1 - pythonArvadosPythonClient: 1.3.0-1 + crunchDispatchSlurm: 1.3.1-1 + crunchRun: 1.3.1-1 + crunchRunner: 1.3.1-1 + keepBalance: 1.3.1-1 + keepStore: 1.3.1-1 + keepWeb: 1.3.1-1 + keepProxy: 1.3.1-1 + libPamArvados: 1.3.1-1 + pythonArvadosFuse: 1.3.1-1 + pythonArvadosPythonClient: 1.3.1-1 gem: - arvados: 1.3.0.20181129194931 - arvadosCLI: 1.3.0.20181129194931 - arvadosLoginSync: 1.3.0.20181129194931 + arvados: 1.3.1.20190122164002 + arvadosCLI: 1.3.1.20190211211047 + arvadosLoginSync: 1.3.1.20190211211047 diff --git a/dockerfiles/1078ECD7.asc b/dockerfiles/1078ECD7.asc new file mode 100644 index 0000000..edc62f4 --- /dev/null +++ b/dockerfiles/1078ECD7.asc @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBEzhgeoBCAChhoK1dqpWzNyDWqRGEvdFdkJaA9D2HRwKPfBfjAoePX6ZyrpA +ItlUsvt/8s/DRiTiPEFQR4S7VqocmU6whJc3gDEGyOM6b1NF873lIfSVwUoE42QE +a76dO8woOYgLUyxu2mKG+bJgGMumjBJt6ZOndYVjTYB/7sEeVxwmMVulfZe0s6zg +ut0+SoTYg2R36qIqeIcWllYt97sEYnyy1qXMis4/3IZnuWkS/frsPR3aeUI4W+o2 +NDN1kj49+LMe7Fb5b7jZY08rZbAWXi1rU1hQx4jC9RvYqlT4HNld4Bn7os1IvOOA +wNiR0oiVdiuDbBxcMvRPktxMrFVjowusRLq/ABEBAAG0PUN1cm92ZXJzZSwgSW5j +IEF1dG9tYXRpYyBTaWduaW5nIEtleSA8c3lzYWRtaW5AY3Vyb3ZlcnNlLmNvbT6J +ATgEEwECACIFAlNgYIECGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEFcW +WREQeOzXPkEH/jQJDIYI1dxWcYiA+hczmpaZvN2/pc/kwIW/6a03+6zqmSNkebOE +TgoDILacSYc17hy20R1/rWyUstOMKcEgFDBlSehhHyl0f7q/w7d8Ais6MabzsPfx +IceJpsjUg87+BR7qWhgQ0sxmtIF2TKuTFLs+nkGsgSsiBOEF4NvHxuj3HD4y8F27 +HNqrkqwjLS8xJwwH5Gp2uMEVr1AXIH3iSRjJ8X124s8iEP97Q/3IazoYRf9/MCSm +QEx8KzxwDX6t4bW6O4D01K+e9gdkTY70dcMgJoqm5IsX7yxjEubiOunphtlJnZ9d +Oi1yBN5UM3pWKAdcfRj4rcfV9Simvpx9av+5AQ0ETOGB6gEIAMAA0HVMG0BbdnU7 +wWgl5eFdT0AUSrXK/WdcKqVEGGv+c68NETSHWZOJX7O46Eao4gY4cTYprVMBzxpY +/BtQSYLpE0HLvBc1fcFd61Yz4H/9rGSNY0GcIQEbOjbJY5mr8qFsQ1K/mAf3aUL3 +b6ni4sHVicRiRr0Gl4Ihorlskpfu1SHs/C5tvTSVNF9p4vtl5892y1yILQeVpcBs +NCR7MUpdS49xCpvnAWsDZX+ij6LTR3lzCm/ZLCg4gNuZkjgU9oqVfGkqysW7WZ8S +OLvzAwUw7i1EIFX8q6QdudGoezxz8m8OgZM1v8AFpYEKlhEPf1W0MSfaRDwrj866 +8nCLruEAEQEAAYkBHwQYAQIACQUCTOGB6gIbDAAKCRBXFlkREHjs199EB/4+p0G1 +3PHxt6rLWSCGXobDOu4ZOA/qnv0D/JhOLroFds5TzQv6vnS8eAkhCTjHVA+b58cm +kXpI0oYcD4ZP+KK1CHKq2rGfwou7HfAF+icnNqYkeBOkjjbCgkvBlcCInuAuU8JX +DZMkfFk52+eBKwTjS/J/fQp0vDru8bHLp98WgdRHWfJQ3mc3gz4A5sR6zhrGPW6/ +ssnROS4dC2Ohp35GpgN1KjD3EmEw5RoSBYlyrARCaMsivgIKMxGUEyFZWhuJt3N1 +2MTddRwz28hbmYCi+MzHYDbRv+cSyUDmvXaWhfkNKBepClBA1rTWBcldit5vvlqr +yPet6wIKrtLGhAqZ +=CLkG +-----END PGP PUBLIC KEY BLOCK----- diff --git a/dockerfiles/Dockerfile.rails-runtime b/dockerfiles/Dockerfile.rails-runtime index 62f02f6..011a1f5 100644 --- a/dockerfiles/Dockerfile.rails-runtime +++ b/dockerfiles/Dockerfile.rails-runtime @@ -4,13 +4,16 @@ FROM phusion/passenger-ruby23 +RUN apt-get update && apt-get install -y gnupg2 + # put nginx in daemon mode again; the arvados-workbench package restarts # nginx, which would lead to a hang otherwise... RUN sed -i 's/daemon off;/#daemon off;/' /etc/nginx/nginx.conf -RUN /usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7 +ADD 1078ECD7.asc /tmp/ +RUN cat /tmp/1078ECD7.asc | apt-key add - -RUN echo "deb http://apt.arvados.org/ xenial-dev main" | tee /etc/apt/sources.list.d/arvados.list +RUN echo "deb http://apt.arvados.org/ bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list RUN apt-get update && apt-get install -qqy tzdata diff --git a/dockerfiles/Dockerfile.runtime b/dockerfiles/Dockerfile.runtime index 078e03a..803169c 100644 --- a/dockerfiles/Dockerfile.runtime +++ b/dockerfiles/Dockerfile.runtime @@ -2,11 +2,14 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM ubuntu:16.04 +FROM ubuntu:18.04 -RUN echo "deb http://apt.arvados.org/ xenial-dev main" > /etc/apt/sources.list.d/apt.arvados.org-dev.list +RUN apt-get update && apt-get install -y gnupg2 -RUN apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7 +RUN echo "deb http://apt.arvados.org/ bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list + +ADD 1078ECD7.asc /tmp/ +RUN cat /tmp/1078ECD7.asc | apt-key add - RUN apt-get update diff --git a/dockerfiles/Dockerfile.shell_server-runtime b/dockerfiles/Dockerfile.shell_server-runtime index 2ac37d6..1b4cc65 100644 --- a/dockerfiles/Dockerfile.shell_server-runtime +++ b/dockerfiles/Dockerfile.shell_server-runtime @@ -2,11 +2,14 @@ # # SPDX-License-Identifier: Apache-2.0 -FROM phusion/baseimage +FROM phusion/baseimage:master -RUN /usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv 1078ECD7 +RUN apt-get update && apt-get install -y gnupg2 -RUN echo "deb http://apt.arvados.org/ xenial-dev main" | tee /etc/apt/sources.list.d/arvados.list +RUN echo "deb http://apt.arvados.org/ bionic main" > /etc/apt/sources.list.d/apt.arvados.org.list + +ADD 1078ECD7.asc /tmp/ +RUN cat /tmp/1078ECD7.asc | apt-key add - RUN apt-get update && apt-get install -qqy tzdata diff --git a/dockerfiles/Dockerfile.slurm-runtime b/dockerfiles/Dockerfile.slurm-runtime index 91b2f94..e36017f 100644 --- a/dockerfiles/Dockerfile.slurm-runtime +++ b/dockerfiles/Dockerfile.slurm-runtime @@ -16,6 +16,6 @@ RUN add-apt-repository \ $(lsb_release -cs) \ stable" RUN apt-get update -RUN apt-get install -y slurm-llnl munge docker-ce +RUN apt-get install -y slurmd slurmctld munge docker-ce RUN mkdir /var/run/munge RUN chown munge /var/run/munge