From be99ac63270e71d97da16a90ba8cfb3a002fa60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= Date: Thu, 25 Sep 2025 21:41:14 +0200 Subject: [PATCH] remove old CI docker files --- .gitignore | 3 +- docker/Dockerfile | 20 ------------- docker/docker-compose.al2.510.yaml | 21 -------------- docker/docker-compose.al2.58.yaml | 21 -------------- docker/docker-compose.al2.59.yaml | 21 -------------- docker/docker-compose.al2.main.yaml | 21 -------------- docker/docker-compose.yaml | 44 ----------------------------- 7 files changed, 2 insertions(+), 149 deletions(-) delete mode 100644 docker/Dockerfile delete mode 100644 docker/docker-compose.al2.510.yaml delete mode 100644 docker/docker-compose.al2.58.yaml delete mode 100644 docker/docker-compose.al2.59.yaml delete mode 100644 docker/docker-compose.al2.main.yaml delete mode 100644 docker/docker-compose.yaml diff --git a/.gitignore b/.gitignore index a9d78eb..35703b1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ xcuserdata Package.resolved .serverless .devcontainer -.amazonq \ No newline at end of file +.amazonq +.ash \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index aa5a229..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -ARG swift_version=5.8 -ARG base_image=swift:$swift_version-amazonlinux2 -FROM $base_image -# needed to do again after FROM due to docker limitation -ARG swift_version - -# dependencies -RUN yum install -y wget perl-Digest-SHA -RUN yum install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests - -# tools -RUN mkdir -p $HOME/.tools -RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile - -# swiftformat (until part of the toolchain) - -ARG swiftformat_version=0.50.1 -RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format -RUN cd $HOME/.tools/swift-format && swift build -c release -RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat diff --git a/docker/docker-compose.al2.510.yaml b/docker/docker-compose.al2.510.yaml deleted file mode 100644 index c4a7775..0000000 --- a/docker/docker-compose.al2.510.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda-events:al2-5.10 - build: - args: - base_image: "swiftlang/swift:nightly-5.10-amazonlinux2" - - soundness: - image: swift-aws-lambda-events:al2-5.10 - - test: - image: swift-aws-lambda-events:al2-5.10 - - test-samples: - image: swift-aws-lambda-events:al2-5.10 - - shell: - image: swift-aws-lambda-events:al2-5.10 diff --git a/docker/docker-compose.al2.58.yaml b/docker/docker-compose.al2.58.yaml deleted file mode 100644 index 18e05b8..0000000 --- a/docker/docker-compose.al2.58.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda-events:al2-5.8 - build: - args: - swift_version: "5.8" - - soundness: - image: swift-aws-lambda-events:al2-5.8 - - test: - image: swift-aws-lambda-events:al2-5.8 - - test-samples: - image: swift-aws-lambda-events:al2-5.8 - - shell: - image: swift-aws-lambda-events:al2-5.8 diff --git a/docker/docker-compose.al2.59.yaml b/docker/docker-compose.al2.59.yaml deleted file mode 100644 index a5288c7..0000000 --- a/docker/docker-compose.al2.59.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda-events:al2-5.9 - build: - args: - swift_version: "5.9" - - soundness: - image: swift-aws-lambda-events:al2-5.9 - - test: - image: swift-aws-lambda-events:al2-5.9 - - test-samples: - image: swift-aws-lambda-events:al2-5.9 - - shell: - image: swift-aws-lambda-events:al2-5.9 diff --git a/docker/docker-compose.al2.main.yaml b/docker/docker-compose.al2.main.yaml deleted file mode 100644 index 64b24f7..0000000 --- a/docker/docker-compose.al2.main.yaml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda-events:al2-main - build: - args: - base_image: "swiftlang/swift:nightly-main-amazonlinux2" - - soundness: - image: swift-aws-lambda-events:al2-main - - test: - image: swift-aws-lambda-events:al2-main - - test-samples: - image: swift-aws-lambda-events:al2-main - - shell: - image: swift-aws-lambda-events:al2-main diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml deleted file mode 100644 index e194a58..0000000 --- a/docker/docker-compose.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# this file is not designed to be run directly -# instead, use the docker-compose.. files -# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.al2.57.yaml run test -version: "3" - -services: - - runtime-setup: - image: swift-aws-lambda:default - build: - context: . - dockerfile: Dockerfile - - common: &common - image: swift-aws-lambda:default - depends_on: [runtime-setup] - volumes: - - ~/.ssh:/root/.ssh - - ..:/code:z - working_dir: /code - cap_drop: - - CAP_NET_RAW - - CAP_NET_BIND_SERVICE - - soundness: - <<: *common - command: /bin/bash -cl "./scripts/soundness.sh" - - test: - <<: *common - command: /bin/bash -cl "swift test --enable-test-discovery -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}" - - test-samples: - <<: *common - command: >- - /bin/bash -clx " - swift build --package-path Examples/Simple - " - - # util - - shell: - <<: *common - entrypoint: /bin/bash