Skip to content

Commit 3ed2e6d

Browse files
authored
Merge pull request anbox#1258 from stephengroat/dockerfile
use dockerfile
2 parents 76a171b + a7d901f commit 3ed2e6d

File tree

3 files changed

+41
-39
lines changed

3 files changed

+41
-39
lines changed

Dockerfile

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
FROM ubuntu:18.04
2+
3+
# hadolint ignore=DL3008
4+
RUN apt-get update && \
5+
apt-get install -qq -y --no-install-recommends \
6+
build-essential \
7+
cmake \
8+
cmake-data \
9+
cmake-extras \
10+
debhelper \
11+
dbus \
12+
git \
13+
google-mock \
14+
libboost-dev \
15+
libboost-filesystem-dev \
16+
libboost-log-dev \
17+
libboost-iostreams-dev \
18+
libboost-program-options-dev \
19+
libboost-system-dev \
20+
libboost-test-dev \
21+
libboost-thread-dev \
22+
libcap-dev \
23+
libegl1-mesa-dev \
24+
libgles2-mesa-dev \
25+
libglm-dev \
26+
libgtest-dev \
27+
liblxc1 \
28+
libproperties-cpp-dev \
29+
libprotobuf-dev \
30+
libsdl2-dev \
31+
libsdl2-image-dev \
32+
libsystemd-dev \
33+
lxc-dev \
34+
pkg-config \
35+
protobuf-compiler && \
36+
apt-get clean && \
37+
rm -rf /var/lib/apt/lists/*
38+
39+
WORKDIR /anbox

scripts/build-with-docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
docker pull ubuntu:18.04
3-
docker run -i -t -v $PWD:/anbox ubuntu:18.04 /anbox/scripts/clean-build.sh
2+
docker build -t anbox/anbox-builder .
3+
docker run -i -t -v $PWD:/anbox anbox/anbox-builder /anbox/scripts/clean-build.sh

scripts/clean-build.sh

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,6 @@
22

33
set -ex
44

5-
apt-get update -qq
6-
apt-get install -qq -y \
7-
build-essential \
8-
cmake \
9-
cmake-data \
10-
cmake-extras \
11-
debhelper \
12-
dbus \
13-
git \
14-
google-mock \
15-
libboost-dev \
16-
libboost-filesystem-dev \
17-
libboost-log-dev \
18-
libboost-iostreams-dev \
19-
libboost-program-options-dev \
20-
libboost-system-dev \
21-
libboost-test-dev \
22-
libboost-thread-dev \
23-
libcap-dev \
24-
libegl1-mesa-dev \
25-
libgles2-mesa-dev \
26-
libglm-dev \
27-
libgtest-dev \
28-
liblxc1 \
29-
libproperties-cpp-dev \
30-
libprotobuf-dev \
31-
libsdl2-dev \
32-
libsdl2-image-dev \
33-
libsystemd-dev \
34-
lxc-dev \
35-
pkg-config \
36-
protobuf-compiler
37-
38-
apt-get clean
39-
40-
cd /anbox
41-
425
cleanup() {
436
# In cases where anbox comes directly from a checked out Android
447
# build environment we miss some symlinks which are present on

0 commit comments

Comments
 (0)