From: Tom Clegg Date: Mon, 20 Nov 2023 20:29:05 +0000 (-0500) Subject: 20846: Merge branch '19213-ubuntu2204-support' into 20846-ubuntu2204 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/28b6afc1e8ccf652c7a8fd43e22a8ac788febd85?hp=9dc967877cb3599ce3584aca57e8c3672f94bd0a 20846: Merge branch '19213-ubuntu2204-support' into 20846-ubuntu2204 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile index 416e746d20..ac5242bc28 100644 --- a/build/package-build-dockerfiles/Makefile +++ b/build/package-build-dockerfiles/Makefile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0 SHELL := '/bin/bash' -all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated +all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated ubuntu2204/generated centos7/generated: common-generated-all test -d centos7/generated || mkdir centos7/generated @@ -29,6 +29,10 @@ ubuntu2004/generated: common-generated-all test -d ubuntu2004/generated || mkdir ubuntu2004/generated cp -f -rlt ubuntu2004/generated common-generated/* +ubuntu2204/generated: common-generated-all + test -d ubuntu2204/generated || mkdir ubuntu2204/generated + cp -f -rlt ubuntu2204/generated common-generated/* + GOTARBALL_=DOES_NOT_EXIST NODETARBALL_=DOES_NOT_EXIST GOVERSION=$(shell grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $$2}') diff --git a/build/package-build-dockerfiles/ubuntu2204/Dockerfile b/build/package-build-dockerfiles/ubuntu2204/Dockerfile new file mode 100644 index 0000000000..f38949b6b2 --- /dev/null +++ b/build/package-build-dockerfiles/ubuntu2204/Dockerfile @@ -0,0 +1,81 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +ARG HOSTTYPE +ARG BRANCH +ARG GOVERSION + +FROM ubuntu:jammy as build_x86_64 +# Install go +ONBUILD ARG GOVERSION +ONBUILD ADD generated/go${GOVERSION}.linux-amd64.tar.gz /usr/local/ +ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ +# Install nodejs and npm +ONBUILD ADD generated/node-v10.23.1-linux-x64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-x64/bin/* /usr/local/bin/ +# On x86, we want some cross-compilation support for arm64 +# Add gcc-aarch64-linux-gnu to compile go binaries for arm64 +ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y gcc-aarch64-linux-gnu +# We also need libpam compiled for arm64, and that requires some sources.list mangling +ONBUILD RUN /bin/sed -i 's/deb http/deb [ arch=amd64 ] http/' /etc/apt/sources.list +ONBUILD ADD ports.list /etc/apt/sources.list.d/ +ONBUILD RUN /usr/bin/dpkg --add-architecture arm64 +ONBUILD RUN /usr/bin/apt-get update && /usr/bin/apt-get install -o APT::Immediate-Configure=0 -q -y libpam0g-dev:arm64 libfuse-dev:arm64 + +FROM ubuntu:jammy as build_aarch64 +# Install go +ONBUILD ARG GOVERSION +ONBUILD ADD generated/go${GOVERSION}.linux-arm64.tar.gz /usr/local/ +ONBUILD RUN ln -s /usr/local/go/bin/go /usr/local/bin/ +# Install nodejs and npm +ONBUILD ADD generated/node-v10.23.1-linux-arm64.tar.xz /usr/local/ +ONBUILD RUN ln -s /usr/local/node-v10.23.1-linux-arm64/bin/* /usr/local/bin/ + +FROM build_${HOSTTYPE} + +LABEL org.opencontainers.image.authors="Arvados Package Maintainers " + +ENV DEBIAN_FRONTEND noninteractive + +SHELL ["/bin/bash", "-c"] +# Install dependencies. +RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python3 python3-pip libcurl4-gnutls-dev libgnutls28-dev curl git libattr1-dev libfuse-dev libpq-dev unzip tzdata python3-venv python3-dev libpam-dev shared-mime-info equivs + +# Install virtualenv +RUN /usr/bin/pip3 install 'virtualenv<20' + +# Install RVM +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ + curl -L https://get.rvm.io | bash -s stable && \ + # Use custom 1.1 openssl -- see: https://github.com/rvm/rvm/issues/5209#issuecomment-1114159447 + /usr/local/rvm/bin/rvm pkg install openssl && \ + /usr/local/rvm/bin/rvm install 2.7 --with-openssl-dir=/usr/local/rvm/usr -j $(grep -c processor /proc/cpuinfo) && \ + /usr/local/rvm/bin/rvm alias create default ruby-2.7 && \ + echo "gem: --no-document" >> ~/.gemrc && \ + /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19 && \ + /usr/local/rvm/bin/rvm-exec default gem install fpm --version 1.10.2 + +RUN /usr/local/rvm/bin/rvm-exec default bundle config --global jobs $(let a=$(grep -c processor /proc/cpuinfo )-1; echo $a) +# Cf. https://build.betterup.com/one-weird-trick-that-will-speed-up-your-bundle-install/ +ENV MAKE "make --jobs $(grep -c processor /proc/cpuinfo)" + +# Preseed the go module cache and the ruby gems, using the currently checked +# out branch of the source tree. This avoids potential compatibility issues +# between the version of Ruby and certain gems. +RUN git clone --depth 1 git://git.arvados.org/arvados.git /tmp/arvados && \ + cd /tmp/arvados && \ + if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \ + cd /tmp/arvados/services/api && \ + /usr/local/rvm/bin/rvm-exec default bundle install && \ + cd /tmp/arvados/apps/workbench && \ + /usr/local/rvm/bin/rvm-exec default bundle install && \ + cd /tmp/arvados && \ + go mod download + + +ENV WORKSPACE /arvados +CMD ["/usr/local/rvm/bin/rvm-exec", "default", "bash", "/jenkins/run-build-packages.sh", "--target", "ubuntu2204"] diff --git a/build/package-build-dockerfiles/ubuntu2204/ports.list b/build/package-build-dockerfiles/ubuntu2204/ports.list new file mode 100644 index 0000000000..a32f44e739 --- /dev/null +++ b/build/package-build-dockerfiles/ubuntu2204/ports.list @@ -0,0 +1,8 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe multiverse +deb [arch=arm64,armhf,ppc64el,s390x] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/build/package-test-dockerfiles/Makefile b/build/package-test-dockerfiles/Makefile index 96a80055ac..8b04fb1480 100644 --- a/build/package-test-dockerfiles/Makefile +++ b/build/package-test-dockerfiles/Makefile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: AGPL-3.0 -all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated +all: centos7/generated debian10/generated debian11/generated rocky8/generated ubuntu1804/generated ubuntu2004/generated ubuntu2204/generated centos7/generated: common-generated-all test -d centos7/generated || mkdir centos7/generated @@ -28,6 +28,10 @@ ubuntu2004/generated: common-generated-all test -d ubuntu2004/generated || mkdir ubuntu2004/generated cp -f -rlt ubuntu2004/generated common-generated/* +ubuntu2204/generated: common-generated-all + test -d ubuntu2204/generated || mkdir ubuntu2204/generated + cp -f -rlt ubuntu2204/generated common-generated/* + RVMKEY1=mpapis.asc RVMKEY2=pkuczynski.asc diff --git a/build/package-test-dockerfiles/ubuntu2204/Dockerfile b/build/package-test-dockerfiles/ubuntu2204/Dockerfile new file mode 100644 index 0000000000..29535b2148 --- /dev/null +++ b/build/package-test-dockerfiles/ubuntu2204/Dockerfile @@ -0,0 +1,29 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + +FROM ubuntu:jammy +LABEL org.opencontainers.image.authors="Arvados Package Maintainers " + +ENV DEBIAN_FRONTEND noninteractive + +# Install dependencies +RUN apt-get update && \ + apt-get -y install --no-install-recommends curl ca-certificates gnupg2 + +# Install RVM +ADD generated/mpapis.asc /tmp/ +ADD generated/pkuczynski.asc /tmp/ +RUN gpg --import --no-tty /tmp/mpapis.asc && \ + gpg --import --no-tty /tmp/pkuczynski.asc && \ + curl -L https://get.rvm.io | bash -s stable && \ + # Use custom 1.1 openssl -- see: https://github.com/rvm/rvm/issues/5209#issuecomment-1114159447 + /usr/local/rvm/bin/rvm pkg install openssl && \ + /usr/local/rvm/bin/rvm install 2.7 --with-openssl-dir=/usr/local/rvm/usr -j $(grep -c processor /proc/cpuinfo) && \ + /usr/local/rvm/bin/rvm alias create default ruby-2.7 && \ + /usr/local/rvm/bin/rvm-exec default gem install bundler --version 2.2.19 + +# udev daemon can't start in a container, so don't try. +RUN mkdir -p /etc/udev/disabled + +RUN echo "deb [trusted=yes] file:///arvados/packages/ubuntu2204/ /" >>/etc/apt/sources.list diff --git a/build/package-testing/test-packages-ubuntu2204.sh b/build/package-testing/test-packages-ubuntu2204.sh new file mode 120000 index 0000000000..54ce94c357 --- /dev/null +++ b/build/package-testing/test-packages-ubuntu2204.sh @@ -0,0 +1 @@ +deb-common-test-packages.sh \ No newline at end of file