From b7aaa7602a6d2a2a29d325965d04ffc49dfbf30a Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Fri, 19 Apr 2024 12:11:36 -0400 Subject: [PATCH] 21700: Remove `bundle install` from package build Dockerfiles This work is better done in the package build script. I suspect the problem that it's trying to solve is better solved by isolating the RailsAPI `vendor` directory as done in 0333f33a7413aadb7159563e0a7aa2a0a50acaec. Arvados-DCO-1.1-Signed-off-by: Brett Smith --- build/package-build-dockerfiles/debian11/Dockerfile | 7 +------ build/package-build-dockerfiles/debian12/Dockerfile | 7 +------ build/package-build-dockerfiles/rocky8/Dockerfile | 7 +------ build/package-build-dockerfiles/ubuntu2004/Dockerfile | 7 +------ build/package-build-dockerfiles/ubuntu2204/Dockerfile | 7 +------ 5 files changed, 5 insertions(+), 30 deletions(-) diff --git a/build/package-build-dockerfiles/debian11/Dockerfile b/build/package-build-dockerfiles/debian11/Dockerfile index e5b4b07b98..c1c9e2d921 100644 --- a/build/package-build-dockerfiles/debian11/Dockerfile +++ b/build/package-build-dockerfiles/debian11/Dockerfile @@ -76,15 +76,10 @@ RUN echo "gem: --no-document" >> ~/.gemrc && \ # 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. +# Preseed the go module cache. RUN git clone git://git.arvados.org/arvados.git /tmp/arvados && \ cd /tmp/arvados && \ if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \ - cd /tmp/arvados/services/api && \ - bundle install && \ - cd /tmp/arvados && \ go mod download ENV WORKSPACE /arvados diff --git a/build/package-build-dockerfiles/debian12/Dockerfile b/build/package-build-dockerfiles/debian12/Dockerfile index 738c9d946f..e25745565e 100644 --- a/build/package-build-dockerfiles/debian12/Dockerfile +++ b/build/package-build-dockerfiles/debian12/Dockerfile @@ -71,15 +71,10 @@ RUN echo "gem: --no-document" >> ~/.gemrc && \ # Cf. https://build.betterup.com/one-weird-trick-that-will-speed-up-your-bundle-install/ ENV MAKE "make --jobs 8" -# 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. +# Preseed the go module cache. RUN git clone git://git.arvados.org/arvados.git /tmp/arvados && \ cd /tmp/arvados && \ if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \ - cd /tmp/arvados/services/api && \ - bundle install && \ - cd /tmp/arvados && \ go mod download ENV WORKSPACE /arvados diff --git a/build/package-build-dockerfiles/rocky8/Dockerfile b/build/package-build-dockerfiles/rocky8/Dockerfile index 38dd5fdbcc..1292a618bc 100644 --- a/build/package-build-dockerfiles/rocky8/Dockerfile +++ b/build/package-build-dockerfiles/rocky8/Dockerfile @@ -82,15 +82,10 @@ RUN echo "gem: --no-document" >> ~/.gemrc && \ # 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. +# Preseed the go module cache. RUN git clone git://git.arvados.org/arvados.git /tmp/arvados && \ cd /tmp/arvados && \ if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \ - cd /tmp/arvados/services/api && \ - bundle install && \ - cd /tmp/arvados && \ go mod download ENV WORKSPACE /arvados diff --git a/build/package-build-dockerfiles/ubuntu2004/Dockerfile b/build/package-build-dockerfiles/ubuntu2004/Dockerfile index c7c9bb791d..dc57c8c03f 100644 --- a/build/package-build-dockerfiles/ubuntu2004/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu2004/Dockerfile @@ -82,15 +82,10 @@ RUN echo "gem: --no-document" >> ~/.gemrc && \ # 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. +# Preseed the go module cache. RUN git clone git://git.arvados.org/arvados.git /tmp/arvados && \ cd /tmp/arvados && \ if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \ - cd /tmp/arvados/services/api && \ - bundle install && \ - cd /tmp/arvados && \ go mod download ENV WORKSPACE /arvados diff --git a/build/package-build-dockerfiles/ubuntu2204/Dockerfile b/build/package-build-dockerfiles/ubuntu2204/Dockerfile index a0ef1c686f..35ef93ff2d 100644 --- a/build/package-build-dockerfiles/ubuntu2204/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu2204/Dockerfile @@ -73,15 +73,10 @@ RUN echo "gem: --no-document" >> ~/.gemrc && \ # Cf. https://build.betterup.com/one-weird-trick-that-will-speed-up-your-bundle-install/ ENV MAKE "make --jobs 8" -# 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. +# Preseed the go module cache. RUN git clone git://git.arvados.org/arvados.git /tmp/arvados && \ cd /tmp/arvados && \ if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \ - cd /tmp/arvados/services/api && \ - bundle install && \ - cd /tmp/arvados && \ go mod download ENV WORKSPACE /arvados -- 2.30.2