Skip to content

Commit e0087f3

Browse files
committed
Fix Docker build
1 parent 4609616 commit e0087f3

File tree

3 files changed

+18
-13
lines changed

3 files changed

+18
-13
lines changed

.dockerignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@ compile_commands.json
2424
tags
2525
tags_sorted_by_file
2626
.tags
27-
.tags_sorted_by_file
27+
.tags_sorted_by_file
28+
cmake-build-debug
29+
cmake-build-release
30+
build

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:18.04
22

3+
ENV DEBIAN_FRONTEND=noninteractive
34
RUN apt-get update && apt-get upgrade -y
45
RUN apt-get install build-essential zlib1g-dev libbz2-dev pkg-config cmake libncurses5-dev autoconf -y
56
RUN apt-get install git bzip2 wget -y
@@ -14,17 +15,17 @@ RUN apt-get install python2.7 python2.7-dev python \
1415
python-pysam \
1516
python-scipy \
1617
-y
17-
RUN apt-get install software-properties-common python-software-properties -y
18+
RUN apt-get install software-properties-common -y
1819
RUN apt-get clean -y
1920

2021
RUN pip install bx-python
2122

22-
RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
23-
add-apt-repository -y ppa:webupd8team/java && \
23+
RUN echo oracle-java11-installer shared/accepted-oracle-license-v1-2 select true | debconf-set-selections && \
24+
add-apt-repository -y ppa:linuxuprising/java && \
2425
apt-get update && \
25-
apt-get install -y oracle-java8-installer && \
26+
apt-get install -y oracle-java11-installer && \
2627
rm -rf /var/lib/apt/lists/* && \
27-
rm -rf /var/cache/oracle-jdk8-installer
28+
rm -rf /var/cache/oracle-jdk11-installer
2829

2930
# copy git repository into the image
3031
RUN mkdir -p /opt/hap.py-source

Dockerfile.ubuntu-with-tests

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:18.04
22

3+
ENV DEBIAN_FRONTEND=noninteractive
34
RUN apt-get update && apt-get upgrade -y
45
RUN apt-get install build-essential zlib1g-dev libbz2-dev pkg-config cmake libncurses5-dev autoconf -y
56
RUN apt-get install git bzip2 wget -y
@@ -14,17 +15,17 @@ RUN apt-get install python2.7 python2.7-dev python \
1415
python-pysam \
1516
python-scipy \
1617
-y
17-
RUN apt-get install software-properties-common python-software-properties -y
18+
RUN apt-get install software-properties-common -y
1819
RUN apt-get clean -y
1920

2021
RUN pip install bx-python
2122

22-
RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
23-
add-apt-repository -y ppa:webupd8team/java && \
23+
RUN echo oracle-java11-installer shared/accepted-oracle-license-v1-2 select true | debconf-set-selections && \
24+
add-apt-repository -y ppa:linuxuprising/java && \
2425
apt-get update && \
25-
apt-get install -y oracle-java8-installer && \
26+
apt-get install -y oracle-java11-installer && \
2627
rm -rf /var/lib/apt/lists/* && \
27-
rm -rf /var/cache/oracle-jdk8-installer
28+
rm -rf /var/cache/oracle-jdk11-installer
2829

2930
# copy git repository into the image
3031
RUN mkdir -p /opt/hap.py-source

0 commit comments

Comments
 (0)