From 503ca1b401b65357c5e6ccaf64a5b2c8ca2c195c Mon Sep 17 00:00:00 2001
From: JP Simard <jp@jpsim.com>
Date: Thu, 6 Oct 2022 00:11:36 -0400
Subject: [PATCH] Fix Dockerfile to account for new test modules

---
 .dockerignore | 1 +
 Dockerfile    | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 1dff8eda5c..4f34bcf922 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,5 @@
 *
+!Plugins
 !Source
 !Tests
 !Package.*
diff --git a/Dockerfile b/Dockerfile
index 0b5da29d75..d8206df625 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,12 +16,11 @@ COPY Package.* ./
 
 RUN ln -s /usr/lib/swift/_InternalSwiftSyntaxParser .
 
-ARG SWIFT_FLAGS="-c release --target swiftlint -Xswiftc -static-stdlib -Xlinker -lCFURLSessionInterface -Xlinker -lCFXMLInterface -Xlinker -lcurl -Xlinker -lxml2 -Xswiftc -I. -Xlinker -fuse-ld=lld -Xlinker -L/usr/lib/swift/linux"
-RUN swift build $SWIFT_FLAGS
+RUN swift package update
+ARG SWIFT_FLAGS="-c release -Xswiftc -static-stdlib -Xlinker -lCFURLSessionInterface -Xlinker -lCFXMLInterface -Xlinker -lcurl -Xlinker -lxml2 -Xswiftc -I. -Xlinker -fuse-ld=lld -Xlinker -L/usr/lib/swift/linux"
+RUN swift run $SWIFT_FLAGS swiftlint version
 RUN mkdir -p /executables
-RUN for executable in $(swift package completion-tool list-executables); do \
-        install -v `swift build $SWIFT_FLAGS --show-bin-path`/$executable /executables; \
-    done
+RUN install -v `swift build $SWIFT_FLAGS --show-bin-path`/swiftlint /executables
 
 # runtime image
 FROM ${RUNTIME_IMAGE}