Merge pull request #519 from myasn1k/docker_fixes

Docker fixes
This commit is contained in:
Thirion Aurélien 2020-08-18 20:41:56 +02:00 committed by GitHub
commit f03c05a15f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 17 deletions

View file

@ -115,13 +115,13 @@ $AIL_HOME/doc/generate_modules_data_flow_graph.sh
#### DB SETUP #### #### DB SETUP ####
# init update version # init update version
pushd ${AIL_HOME} #pushd ${AIL_HOME}
# shallow clone # shallow clone
git fetch --depth=500 --tags --prune #git fetch --depth=500 --tags --prune
git describe --abbrev=0 --tags | tr -d '\n' > ${AIL_HOME}/update/current_version #git describe --abbrev=0 --tags | tr -d '\n' > ${AIL_HOME}/update/current_version
echo "AIL current version:" #echo "AIL current version:"
git describe --abbrev=0 --tags #git describe --abbrev=0 --tags
popd #popd
# LAUNCH ARDB # LAUNCH ARDB
bash ${AIL_BIN}/LAUNCH.sh -lav & bash ${AIL_BIN}/LAUNCH.sh -lav &

View file

@ -1,4 +1,7 @@
FROM ubuntu:16.04 FROM ubuntu:18.04
ARG tz_buildtime=Europe/Rome
ENV TZ=$tz_buildtime
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Make sure that all updates are in place # Make sure that all updates are in place
RUN apt-get clean && apt-get update -y && apt-get upgrade -y \ RUN apt-get clean && apt-get update -y && apt-get upgrade -y \
@ -19,12 +22,6 @@ WORKDIR /opt/AIL
RUN ./installing_deps.sh RUN ./installing_deps.sh
WORKDIR /opt/AIL WORKDIR /opt/AIL
# Installing Web dependencies,
# remove all the parts below if you dont need the Web UI
WORKDIR /opt/AIL/var/www
RUN ./update_thirdparty.sh
WORKDIR /opt/AIL
# Default to UTF-8 file.encoding # Default to UTF-8 file.encoding
ENV LANG C.UTF-8 ENV LANG C.UTF-8
ENV AIL_HOME /opt/AIL ENV AIL_HOME /opt/AIL
@ -38,7 +35,6 @@ ENV PATH ${AIL_VENV}/bin:${AIL_HOME}:${AIL_REDIS}:${AIL_ARDB}:${AIL_BIN}:${AIL_F
RUN ./pystemon/install.sh RUN ./pystemon/install.sh
RUN pip install -r /opt/pystemon/requirements.txt RUN pip install -r /opt/pystemon/requirements.txt
RUN pip install -r /opt/AIL/crawler_requirements.txt
COPY docker_start.sh /docker_start.sh COPY docker_start.sh /docker_start.sh
ENTRYPOINT ["/bin/bash", "docker_start.sh"] ENTRYPOINT ["/bin/bash", "docker_start.sh"]

View file

@ -1,4 +1,4 @@
Docker Quick Start (Ubuntu 16.04 LTS) Docker Quick Start (Ubuntu 18.04 LTS)
------------ ------------
:warning: :warning:
@ -19,7 +19,10 @@ curl https://get.docker.com | /bin/bash
```bash ```bash
git clone https://github.com/CIRCL/AIL-framework.git git clone https://github.com/CIRCL/AIL-framework.git
cd AIL-framework cd AIL-framework
docker build -t ail-framework . cp -r ./other_installers/docker/Dockerfile ./other_installers/docker/docker_start.sh ./other_installers/docker/pystemon ./
cp ./configs/update.cfg.sample ./configs/update.cfg
vim/nano ./configs/update.cfg (set auto_update to False)
docker build --build-arg tz_buildtime=YOUR_GEO_AREA/YOUR_CITY -t ail-framework .
``` ```
3. To start AIL on port 7000, type the following command below: 3. To start AIL on port 7000, type the following command below:
``` ```

View file

@ -13,6 +13,7 @@ signalListener() {
source ./AILENV/bin/activate source ./AILENV/bin/activate
cd bin cd bin
./LAUNCH.sh -l ./LAUNCH.sh -l
./LAUNCH.sh -c
./LAUNCH.sh -f ./LAUNCH.sh -f
signalListener tail -f /dev/null $@ signalListener tail -f /dev/null $@

View file

@ -93,7 +93,7 @@ wget -q https://raw.githubusercontent.com/flot/flot/958e5fd43c6dff4bab3e1fd5cb61
wget -q http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js -O ./static/js/jquery.sparkline.min.js wget -q http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js -O ./static/js/jquery.sparkline.min.js
wget -q http://canvasjs.com/fdm/chart/ -O temp/canvasjs.zip wget -q http://canvasjs.com/fdm/chart/ -O temp/canvasjs.zip
unzip -qq temp/canvasjs.zip -d temp/ unzip -qq temp/canvasjs.zip -d temp/
mv temp/canvasjs-2.3.2/Chart\ 2.3.2\ GA\ -\ Stable/jquery.canvasjs.min.js ./static/js/jquery.canvasjs.min.js mv temp/Chart\ 2.3.2\ GA\ -\ Stable/jquery.canvasjs.min.js ./static/js/jquery.canvasjs.min.js
wget -q https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip -O temp/jquery-ui.zip wget -q https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip -O temp/jquery-ui.zip
unzip -qq temp/jquery-ui.zip -d temp/ unzip -qq temp/jquery-ui.zip -d temp/