Skip to content

Commit

Permalink
update docker to point to the latest release
Browse files Browse the repository at this point in the history
  • Loading branch information
Srinivas11789 committed Aug 15, 2019
1 parent 74ea630 commit 066e3b3
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 8 deletions.
25 changes: 19 additions & 6 deletions Dockerfile
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,37 @@ FROM ubuntu:latest
MAINTAINER Srinivas Piskala Ganesh Babu "[email protected]"

# Apt update and install - nginx and git
#RUN apt-get update && apt-get upgrade -y
RUN apt-get update
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get install -y graphviz
RUN apt-get install -y python-tk
RUN apt-get install -y python-pip
RUN apt-get install -y python3-tk
RUN apt-get install -y python3-pip
RUN apt-get install -y python3-pil
RUN apt-get install -y python3-pil.imagetk
RUN apt-get install -y nginx
RUN apt-get install -y git-core
RUN apt-get install -y sudo
RUN apt-get install -y libx11-dev

# Fetching the latest source code from the github repo of devOps
RUN apt-get install -y libnss3
RUN apt-get install -y libx11-xcb1
RUN apt-get update && \
apt-get install -yq --no-install-recommends \
libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
libnss3
RUN apt-get install -y libgtk2.0-0

# Fetching the latest source code from the github repo of pcapxray
RUN git clone https://github.com/srinivas11789/PcapXray

### Master branch changes - srinivas11789/pcapxray
RUN pip install -r PcapXray/requirements.txt
RUN pip3 install --upgrade -r PcapXray/requirements.txt

WORKDIR PcapXray/Source
CMD python main.py
CMD python3 main.py

### Develop/Beta branch changes - srinivas11789/pcapxray-beta
#WORKDIR PcapXray
Expand Down
4 changes: 2 additions & 2 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
# Run Docker Image - Production (Master)
#docker run --rm -d --name pcapxray -e DISPLAY=$IP:0 -v /tmp/.X11-unix:/tmp/.X11-unix srinivas11789/pcapxray
# Run Docker Image - Staging (Develop)
docker run --rm -d --name pcapxray -v ${PWD}/artifacts:/tmp/artifacts -e DISPLAY=$IP:0 -v /tmp/.X11-unix:/tmp/.X11-unix srinivas11789/pcapxray-2.5
docker run --rm -d --name pcapxray -v ${PWD}/artifacts:/tmp/artifacts -e DISPLAY=$IP:0 -v /tmp/.X11-unix:/tmp/.X11-unix srinivas11789/pcapxray-2_9


#elif [[ "$OSTYPE" == "linux-gnu" ]]; then
Expand All @@ -44,7 +44,7 @@ else
# Run docker - Production (Master)
#docker run --rm --net=host --env="DISPLAY" --volume="$HOME/.Xauthority:/root/.Xauthority:rw" srinivas11789/pcapxray
# Run docker - Staging (Develop)
docker run --rm -d --name pcapxray -v ${PWD}/artifacts:/tmp/artifacts --net=host --env="DISPLAY" --volume="$HOME/.Xauthority:/root/.Xauthority:rw" srinivas11789/pcapxray-2.5
docker run --rm -d --name pcapxray -v ${PWD}/artifacts:/tmp/artifacts --net=host --env="DISPLAY" --volume="$HOME/.Xauthority:/root/.Xauthority:rw" srinivas11789/pcapxray-2_9
fi

#else
Expand Down

0 comments on commit 066e3b3

Please sign in to comment.