Skip to content

Commit f3b6ad0

Browse files
committed
Merge pull request #2 from docker-swift/package-streamline
Tidy up apt-get and remove redundant packages, using @oletterers work.
2 parents 809f400 + 7d410c1 commit f3b6ad0

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

Dockerfile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
21
FROM phusion/baseimage:0.9.17
32
MAINTAINER Haris Amin <[email protected]>
43

54
# Use baseimage-docker's init system.
65
CMD ["/sbin/my_init"]
76

8-
RUN apt-get update && apt-get upgrade -y && apt-get install -y curl wget git make
9-
10-
# Ubuntu Swift Requirements: https://github.com/apple/swift#system-requirements
11-
RUN sudo apt-get install -y git cmake ninja-build clang uuid-dev libicu-dev icu-devtools libbsd-dev libedit-dev libxml2-dev libsqlite3-dev swig libpython-dev libncurses5-dev pkg-config
12-
RUN sudo apt-get install -y clang-3.6
13-
RUN sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-3.6 100
14-
RUN sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-3.6 100
7+
RUN apt-get update && \
8+
apt-get -y upgrade && \
9+
apt-get install -y build-essential wget clang libedit-dev python2.7 python2.7-dev libicu52 && \
10+
rm -rf /var/lib/apt/lists/*
1511

1612
# Download Swift Ubuntu 14.04 Snapshot
1713
RUN wget https://swift.org/builds/ubuntu1404/swift-2.2-SNAPSHOT-2015-12-01-b/swift-2.2-SNAPSHOT-2015-12-01-b-ubuntu14.04.tar.gz
@@ -31,4 +27,4 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
3127
ENV PATH /usr/bin:$PATH
3228

3329
# Print Installed Swift Version
34-
RUN swift --version
30+
RUN swift --version

0 commit comments

Comments
 (0)