diff --git a/installing_deps.sh b/installing_deps.sh index d1ed2a1b..a3275648 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -115,13 +115,13 @@ $AIL_HOME/doc/generate_modules_data_flow_graph.sh #### DB SETUP #### # init update version -pushd ${AIL_HOME} +#pushd ${AIL_HOME} # shallow clone -git fetch --depth=500 --tags --prune -git describe --abbrev=0 --tags | tr -d '\n' > ${AIL_HOME}/update/current_version -echo "AIL current version:" -git describe --abbrev=0 --tags -popd +#git fetch --depth=500 --tags --prune +#git describe --abbrev=0 --tags | tr -d '\n' > ${AIL_HOME}/update/current_version +#echo "AIL current version:" +#git describe --abbrev=0 --tags +#popd # LAUNCH ARDB bash ${AIL_BIN}/LAUNCH.sh -lav & diff --git a/other_installers/docker/Dockerfile b/other_installers/docker/Dockerfile index 533c44c4..782571ab 100644 --- a/other_installers/docker/Dockerfile +++ b/other_installers/docker/Dockerfile @@ -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 RUN apt-get clean && apt-get update -y && apt-get upgrade -y \ @@ -19,12 +22,6 @@ WORKDIR /opt/AIL RUN ./installing_deps.sh 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 ENV LANG C.UTF-8 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 pip install -r /opt/pystemon/requirements.txt -RUN pip install -r /opt/AIL/crawler_requirements.txt COPY docker_start.sh /docker_start.sh ENTRYPOINT ["/bin/bash", "docker_start.sh"] diff --git a/other_installers/docker/README.md b/other_installers/docker/README.md index 265defab..c7e6d4ff 100644 --- a/other_installers/docker/README.md +++ b/other_installers/docker/README.md @@ -1,4 +1,4 @@ -Docker Quick Start (Ubuntu 16.04 LTS) +Docker Quick Start (Ubuntu 18.04 LTS) ------------ :warning: @@ -19,7 +19,10 @@ curl https://get.docker.com | /bin/bash ```bash git clone https://github.com/CIRCL/AIL-framework.git 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: ``` diff --git a/other_installers/docker/docker_start.sh b/other_installers/docker/docker_start.sh index c8f06010..5b0e1b06 100755 --- a/other_installers/docker/docker_start.sh +++ b/other_installers/docker/docker_start.sh @@ -13,6 +13,7 @@ signalListener() { source ./AILENV/bin/activate cd bin ./LAUNCH.sh -l +./LAUNCH.sh -c ./LAUNCH.sh -f signalListener tail -f /dev/null $@ diff --git a/var/www/update_thirdparty.sh b/var/www/update_thirdparty.sh index 47040930..f51ae231 100755 --- a/var/www/update_thirdparty.sh +++ b/var/www/update_thirdparty.sh @@ -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://canvasjs.com/fdm/chart/ -O temp/canvasjs.zip 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 unzip -qq temp/jquery-ui.zip -d temp/