Add requirements.txt file for nightly image (#412)

* add requirements.txt file, install in docker image * pass base repo as context to docker build
swiftlang · Sep 3, 2024 · 2928d6a · 2928d6a
1 parent 0ba5db9
commit 2928d6a
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 4 deletions.
diff --git a/ci_test.py b/ci_test.py
@@ -45,8 +45,7 @@ def get_dockerfiles():
         filename = file_info['filename']
         print(filename)
         if "Dockerfile" in filename and not "windows" in filename:
-            file_dir = filename.replace("Dockerfile", "")
-            dockerfiles.append(file_dir)
+            dockerfiles.append(filename)
     return dockerfiles
 
 
@@ -69,15 +68,15 @@ def main():
         sys.stdout.flush()
         log_file = dockerfile.replace(docker_dir,"").replace("/", "_")
         log_file = "{}.log".format(log_file)
-        cmd = f"docker build --no-cache=true {dockerfile}"
+        cmd = "docker build --no-cache=true -f {dockerfile} .".format(dockerfile=dockerfile)
         if "buildx" in dockerfile:
             # if "buildx" is part of the path, we want to use the new buildx build system and build
             # for both amd64 and arm64.
             cmd = "docker buildx create --use"
             run_command(cmd, log_file)
             cmd = "docker buildx inspect --bootstrap"
             run_command(cmd, log_file)
-            cmd = f"docker buildx build --platform linux/arm64,linux/amd64 --no-cache=true {dockerfile}"
+            cmd = "docker buildx build --platform linux/arm64,linux/amd64 --no-cache=true -f {dockerfile} .".format(dockerfile=dockerfile)
         status = run_command(cmd, log_file)
         results[dockerfile] = status
         if status != 0:

diff --git a/swift-ci/dependencies/requirements.txt b/swift-ci/dependencies/requirements.txt
@@ -0,0 +1,7 @@
+# The following come from https://github.com/llvm/llvm-project/blob/main/lldb/test/requirements.txt
+# These Python packages are required to be able to run the LLDB test suite.
+psutil>=5.9.4
+# Pexpect tests are known not to work on Windows, so are disabled.
+# See llvm.org/pr22274.
+pexpect>=4.9.0; sys_platform != 'win32'
+packaging
diff --git a/swift-ci/main/amazon-linux/2/Dockerfile b/swift-ci/main/amazon-linux/2/Dockerfile
@@ -44,6 +44,9 @@ RUN yum -y install \
 
 RUN mkdir -p /usr/local/lib/python3.7/site-packages/
 
+COPY swift-ci/dependencies/requirements.txt /dependencies/
+RUN pip3 install -r /dependencies/requirements.txt
+
 RUN easy_install-3.7 six
 
 ARG SWIFT_PLATFORM=amazonlinux2

diff --git a/swift-ci/main/ubuntu/18.04/Dockerfile b/swift-ci/main/ubuntu/18.04/Dockerfile
@@ -34,6 +34,9 @@ RUN apt -y update && apt -y install \
   uuid-dev              \
   zip
 
+COPY swift-ci/dependencies/requirements.txt /dependencies/
+RUN pip3 install -r /dependencies/requirements.txt
+
 ARG SWIFT_PLATFORM=ubuntu18.04
 ARG SWIFT_VERSION=5.8.1
 ARG SWIFT_BRANCH=swift-${SWIFT_VERSION}-release

diff --git a/swift-ci/main/ubuntu/20.04/Dockerfile b/swift-ci/main/ubuntu/20.04/Dockerfile
@@ -34,6 +34,9 @@ RUN apt-get -y update && apt-get -y install \
   uuid-dev              \
   zip
 
+COPY swift-ci/dependencies/requirements.txt /dependencies/
+RUN pip3 install -r /dependencies/requirements.txt
+
 ARG SWIFT_PLATFORM=ubuntu20.04
 ARG SWIFT_VERSION=5.8.1
 ARG SWIFT_BRANCH=swift-${SWIFT_VERSION}-release

diff --git a/swift-ci/main/ubuntu/22.04/Dockerfile b/swift-ci/main/ubuntu/22.04/Dockerfile
@@ -37,6 +37,9 @@ RUN apt-get -y update && apt-get -y install \
   uuid-dev              \
   zip
 
+COPY swift-ci/dependencies/requirements.txt /dependencies/
+RUN pip3 install -r /dependencies/requirements.txt
+
 ARG SWIFT_PLATFORM=ubuntu22.04
 ARG SWIFT_VERSION=5.8.1
 ARG SWIFT_BRANCH=swift-${SWIFT_VERSION}-release

diff --git a/swift-ci/main/ubuntu/23.10/Dockerfile b/swift-ci/main/ubuntu/23.10/Dockerfile
@@ -31,6 +31,9 @@ RUN apt-get -y update && apt-get -y install \
   uuid-dev              \
   zip
 
+COPY swift-ci/dependencies/requirements.txt /dependencies/
+RUN pip3 install -r /dependencies/requirements.txt --break-system-packages
+
 ARG SWIFT_PLATFORM=ubuntu23.10
 ARG SWIFT_VERSION=5.10.1
 ARG SWIFT_BRANCH=swift-${SWIFT_VERSION}-release

diff --git a/swift-ci/main/ubuntu/24.04/Dockerfile b/swift-ci/main/ubuntu/24.04/Dockerfile
@@ -32,6 +32,9 @@ RUN apt-get -y update && apt-get -y install \
   uuid-dev              \
   zip
 
+COPY swift-ci/dependencies/requirements.txt /dependencies/
+RUN pip3 install -r /dependencies/requirements.txt --break-system-packages
+
 ARG SWIFT_PLATFORM=ubuntu24.04
 ARG SWIFT_VERSION=5.10.1
 ARG SWIFT_BRANCH=swift-${SWIFT_VERSION}-release