Commit ba589776 authored by Drew's avatar Drew

Add libcurl4-openssl-dev wamerican vim

* libcurl4-openssl-dev is for foundation (NSURLSession-related?).  We could have used some other SSL, that seemed like the best one at the time
* wamerican is per https://lists.swift.org/pipermail/swift-corelibs-dev/Week-of-Mon-20160808/000863.html
* vim is because the tests complain about it not being installed.  Apparently Swift is a church-of-vi project.
parent 26ea0427
FROM debian:latest
MAINTAINER Drew Crawford
ENV SWIFT_TAG="__TAG__" RUNTIME_PACKAGES="clang libedit2 libpython2.7 libxml2 libicu52" BUILDTIME_PACKAGES="git ca-certificates python ninja-build cmake uuid-dev libbsd-dev libicu-dev pkg-config libedit-dev file libxml2-dev python-dev libncurses5-dev libsqlite3-dev libreadline6-dev rsync"
ENV SWIFT_TAG="__TAG__" RUNTIME_PACKAGES="clang libedit2 libpython2.7 libxml2 libicu52" BUILDTIME_PACKAGES="git ca-certificates python ninja-build cmake uuid-dev libbsd-dev libicu-dev pkg-config libedit-dev file libxml2-dev python-dev libncurses5-dev libsqlite3-dev libreadline6-dev rsync libcurl4-openssl-dev wamerican vim"
# for libdispatch, we also need more stuff
ENV BUILDTIME_PACKAGES="$BUILDTIME_PACKAGES make gobjc automake autoconf libtool pkg-config systemtap-sdt-dev libblocksruntime-dev libkqueue-dev libpthread-workqueue-dev libbsd-dev"
......@@ -36,8 +36,8 @@ RUN bash /swift-dev/update-tags.sh
# RUN git am -3 < ../SAMPLE.patch
# use CaffeinatedSwift
RUN git remote add CaffeinatedSwift https://code.sealedabstract.com/CaffeinatedSwift/swift.git && git fetch CaffeinatedSwift --tags && git checkout caffeinated-$SWIFT_TAG
RUN cd ../swift-corelibs-libdispatch && git remote add CaffeinatedSwift https://code.sealedabstract.com/CaffeinatedSwift/swift-corelibs-libdispatch.git && git fetch CaffeinatedSwift --tags && git checkout caffeinated-$SWIFT_TAG && git submodule update
# RUN git remote add CaffeinatedSwift https://code.sealedabstract.com/CaffeinatedSwift/swift.git && git fetch CaffeinatedSwift --tags && git checkout caffeinated-$SWIFT_TAG
# RUN cd ../swift-corelibs-libdispatch && git remote add CaffeinatedSwift https://code.sealedabstract.com/CaffeinatedSwift/swift-corelibs-libdispatch.git && git fetch CaffeinatedSwift --tags && git checkout caffeinated-$SWIFT_TAG && git submodule update
# And now we build, like a good little linuxen.
# I believe this is what the linux build script does. In practice, this builds a system into /tmp/install and then tars it up.
......
......@@ -2,5 +2,6 @@ FROM debian:latest
MAINTAINER Drew Crawford
#these: libblocksruntime-dev libkqueue0 libpthread-workqueue0 are libdispatch-related
#these: libbsd-dev libicu-dev are static-stdlib related
RUN apt-get update && apt-get install --no-install-recommends -y clang libedit2 libpython2.7 libxml2 libicu52 libblocksruntime-dev libkqueue0 libpthread-workqueue0 libbsd-dev libicu-dev && rm -rf rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
#these: libcurl4-openssl-dev are foundation-related
RUN apt-get update && apt-get install --no-install-recommends -y clang libedit2 libpython2.7 libxml2 libicu52 libblocksruntime-dev libkqueue0 libpthread-workqueue0 libbsd-dev libicu-dev libcurl4-openssl-dev && rm -rf rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ADD swift-local.tar.gz /
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment