Skip to content

Commit 65f6d2e

Browse files
committed
Update osxcross image to ubuntu 18.04
1 parent b4a1296 commit 65f6d2e

File tree

1 file changed

+13
-35
lines changed

1 file changed

+13
-35
lines changed

osxcross/Dockerfile.osxcross

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This is an image used to compile and test Dark. Later, we will use this to
22
# create another dockerfile to deploy.
33

4-
FROM ubuntu:17.10
4+
FROM ubuntu:18.04
55

66
ENV FORCE_BUILD 1
77

@@ -18,7 +18,8 @@ RUN DEBIAN_FRONTEND=noninteractive \
1818
curl \
1919
apt-transport-https \
2020
ca-certificates \
21-
lsb-core
21+
lsb-core \
22+
gnupg
2223

2324
# Latest NPM (taken from https://deb.nodesource.com/setup_8.x )
2425
RUN curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
@@ -54,50 +55,27 @@ RUN DEBIAN_FRONTEND=noninteractive \
5455
apt install \
5556
--no-install-recommends \
5657
-y \
57-
software-properties-common=0.96.24.17 \
58-
python3.6=3.6.3-1ubuntu1 \
59-
make=4.1-9.1 \
60-
m4=1.4.18-1 \
61-
rsync=3.1.2-2ubuntu0.2 \
62-
git=1:2.14.1-1ubuntu4 \
63-
wget=1.19.1-3ubuntu1.2 \
64-
sudo=1.8.20p2-1ubuntu1 \
65-
locales=2.26-0ubuntu2.1 \
66-
expect=5.45-8 \
58+
make \
59+
m4 \
60+
rsync \
61+
git \
62+
wget \
63+
sudo \
64+
locales \
65+
expect \
6766
tcl8.6 \
68-
libev-dev=1:4.22-1 \
69-
libgmp-dev=2:6.1.2+dfsg-1 \
70-
pkg-config=0.29.1-0ubuntu2 \
67+
libgmp-dev \
68+
pkg-config \
7169
libcurl4-gnutls-dev \
72-
python-software-properties=0.96.24.17 \
73-
libpq-dev=9.6.9-0ubuntu0.17.10 \
74-
postgresql-9.6=9.6.9-0ubuntu0.17.10 \
75-
postgresql-client-9.6=9.6.9-0ubuntu0.17.10 \
76-
postgresql-contrib-9.6=9.6.9-0ubuntu0.17.10 \
77-
chromium-browser \
78-
firefox \
79-
gnupg \
80-
nodejs \
81-
google-chrome-stable \
82-
dnsmasq \
83-
cron \
8470
google-cloud-sdk \
8571
jq \
8672
vim \
8773
dnsutils \
88-
docker-ce \
8974
unzip \
9075
build-essential \
9176
ruby \
9277
kubectl \
93-
python3-pip \
94-
libsodium-dev \
9578
gcc \
96-
python-dev \
97-
python-setuptools \
98-
pgcli \
99-
xvfb \
100-
ffmpeg \
10179
tmux \
10280
&& apt clean \
10381
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)