From f5089f1cdb0ad98c101e87e9b9af46273d4b3b2c Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Mon, 14 Sep 2020 19:14:25 +0100 Subject: [PATCH 1/2] Supply a prebuilt image in Dockerfile --- Dockerfile | 14 +------------- prebuilt.Dockerfile | 13 +++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 prebuilt.Dockerfile diff --git a/Dockerfile b/Dockerfile index 4b27b183..2b365cde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1 @@ -FROM swift:5.2 as builder -WORKDIR /swiftdoc -COPY . . -RUN apt-get -qq update && apt-get install -y libxml2-dev && rm -r /var/lib/apt/lists/* -RUN mkdir -p /build/lib && cp -R /usr/lib/swift/linux/*.so* /build/lib -RUN make install prefix=/build - -FROM ubuntu:18.04 -RUN apt-get -qq update && apt-get install -y graphviz libatomic1 libxml2-dev libcurl4-openssl-dev && rm -r /var/lib/apt/lists/* -COPY --from=builder /build/bin/swift-doc /usr/bin -COPY --from=builder /build/lib/* /usr/lib/ -ENTRYPOINT ["swift-doc"] -CMD ["--help"] +FROM swiftdoc/swift-doc:latest diff --git a/prebuilt.Dockerfile b/prebuilt.Dockerfile new file mode 100644 index 00000000..1f656e89 --- /dev/null +++ b/prebuilt.Dockerfile @@ -0,0 +1,13 @@ +FROM swift:5.3 as builder +WORKDIR /swiftdoc +COPY . . +RUN apt-get -qq update && apt-get install -y libxml2-dev && rm -r /var/lib/apt/lists/* +RUN mkdir -p /build/lib && cp -R /usr/lib/swift/linux/*.so* /build/lib +RUN make install prefix=/build + +FROM ubuntu:18.04 +RUN apt-get -qq update && apt-get install -y graphviz libatomic1 libxml2-dev libcurl4-openssl-dev && rm -r /var/lib/apt/lists/* +COPY --from=builder /build/bin/swift-doc /usr/bin +COPY --from=builder /build/lib/* /usr/lib/ +ENTRYPOINT ["swift-doc"] +CMD ["--help"] From 44811b25c42a8ef33392c9e6ceb88e22acf40bea Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Fri, 18 Sep 2020 22:53:34 +0100 Subject: [PATCH 2/2] Add an entry for prebuilt image to Changelog.md --- Changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog.md b/Changelog.md index 71ab4186..42320d1c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Supply a prebuilt image in Dockerfile. + #184 by @MaxDesiatov. - Fixed missing GraphViz dependency in Dockerfile. #180 by @MaxDesiatov. - Fixed listing of function parameters, when generating CommonMark documentation.