Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.

Commit 138aab8

Browse files
author
Antal János Monori
committed
Added dependencies to kvm
1 parent 89ac34c commit 138aab8

File tree

3 files changed

+12
-52
lines changed

3 files changed

+12
-52
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## 1.0.2
44

55
- Removing API 27 and TV emulator to speed up image for now
6+
- Ensuring that KVM is installed and enabled
67

78
## 1.0.1
89

Dockerfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ EXPOSE 5037
88
EXPOSE 5554
99
EXPOSE 5555
1010
EXPOSE 5900
11-
EXPOSE 80
1211
EXPOSE 443
12+
EXPOSE 80
13+
14+
# Install additional system dependencies
15+
COPY dependencies.txt /var/temp/dependencies.txt
16+
RUN dpkg --add-architecture i386 && apt-get update
17+
RUN apt-get install -y --allow-change-held-packages $(cat /var/temp/dependencies.txt)
1318

1419
# Copy various scripts over
1520
COPY scripts /opt/scripts
@@ -24,7 +29,7 @@ COPY android-packages.txt /var/temp/android-packages.txt
2429
# RUN sdkmanager --package_file="/var/temp/android-packages.txt" --channel=0 --sdk_root="$ANDROID_HOME" --verbose
2530
RUN sdkmanager --channel=0 --sdk_root="$ANDROID_HOME" --verbose \
2631
"platforms;android-23" \
27-
"system-images;android-23;google_apis;x86_64"
32+
"system-images;android-23;google_apis;x86_64"
2833

2934
# Cleaning
3035
RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

dependencies.txt

Lines changed: 4 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,4 @@
1-
expect
2-
git
3-
unzip
4-
wget
5-
libc6-i386
6-
lib32stdc++6
7-
lib32gcc1
8-
lib32ncurses5
9-
lib32z1
10-
python
11-
make
12-
autoconf
13-
automake
14-
bzip2
15-
file
16-
g++
17-
gcc
18-
imagemagick
19-
libbz2-dev
20-
libc6-dev
21-
libcurl3
22-
libdb-dev
23-
libevent-dev
24-
libffi-dev
25-
libgeoip-dev
26-
libglib2.0-dev
27-
libjpeg-dev
28-
liblzma-dev
29-
libmagickcore-dev
30-
libmagickwand-dev
31-
libmysqlclient-dev
32-
libncurses-dev
33-
libpng-dev
34-
libpq-dev
35-
libreadline-dev
36-
libsqlite3-dev
37-
libssl-dev
38-
libtool
39-
libwebp-dev
40-
libxml2-dev
41-
libxslt-dev
42-
libyaml-dev
43-
patch
44-
xz-utils
45-
zlib1g-dev
46-
software-properties-common
47-
curl
48-
libncurses5:i386
49-
libstdc++6:i386
50-
zlib1g:i386
1+
qemu-kvm
2+
libvirt-bin
3+
ubuntu-vm-builder
4+
bridge-utils

0 commit comments

Comments
 (0)