Skip to content

Commit 21fbbad

Browse files
committed
Update Dockerfile to Ubuntu 18.04 and cleanup syntax
1 parent 747dff8 commit 21fbbad

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

docker/Dockerfile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ubuntu:14.04
1+
FROM ubuntu:18.04
2+
3+
ENV DEBIAN_FRONTEND="noninteractive"
24

35
# install depdencies
46
RUN apt-get update && apt-get install -y \
@@ -12,17 +14,17 @@ RUN apt-get update && apt-get install -y \
1214
git
1315

1416
# Download the latest version of the code from GitHub
15-
WORKDIR /opt/
16-
RUN git clone https://github.com/USArmyResearchLab/Dshell.git
17+
RUN git -C /opt clone https://github.com/USArmyResearchLab/Dshell.git
1718

1819
# download and untar GeoIP files
1920
WORKDIR /opt/Dshell/share/GeoIP/
20-
RUN wget https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
21-
RUN wget https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz
22-
RUN tar -zxf GeoLite2-Country.tar.gz
23-
RUN tar -zxf GeoLite2-ASN.tar.gz
24-
RUN GeoLite2-Country*/GeoLite2-Country.mmdb .
25-
RUN GeoLite2-ASN*/GeoLite2-ASN.mmdb .
21+
RUN wget https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz \
22+
&& wget https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz \
23+
&& tar -zxf GeoLite2-Country.tar.gz \
24+
&& tar -zxf GeoLite2-ASN.tar.gz \
25+
&& ln -s GeoLite2-Country*/GeoLite2-Country.mmdb . \
26+
&& ln -s GeoLite2-ASN*/GeoLite2-ASN.mmdb . \
27+
&& rm -rf /var/lib/apt/lists/*
2628

2729
# make Dshell
2830
WORKDIR /opt/Dshell/
@@ -31,4 +33,4 @@ RUN make
3133
# Used to mount pcap from a host OS directory
3234
VOLUME ["/mnt/pcap"]
3335

34-
CMD ["/opt/Dshell/dshell"]
36+
ENTRYPOINT ["/opt/Dshell/dshell"]

0 commit comments

Comments
 (0)