diff --git a/setup/docker/dockerfile/Dockerfile b/setup/docker/dockerfile/Dockerfile index 28b7649e..c427108c 100644 --- a/setup/docker/dockerfile/Dockerfile +++ b/setup/docker/dockerfile/Dockerfile @@ -32,28 +32,6 @@ RUN curl -fsSL "$GLIDE_DOWNLOAD_URL" -o glide.tar.gz \ && ln -s /usr/local/glide/linux-amd64/glide /usr/local/bin/ \ && rm glide.tar.gz -# nginx Install -RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \ - && echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" >> /etc/apt/sources.list \ - && apt-get update \ - && apt-get install --no-install-recommends --no-install-suggests -y \ - ca-certificates \ - nginx \ - nginx-module-xslt \ - nginx-module-geoip \ - nginx-module-image-filter \ - nginx-module-perl \ - nginx-module-njs \ - gettext-base \ - wget \ - unzip \ - && rm -rf /var/lib/apt/lists/* - -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log - -COPY nginx.conf /etc/nginx/nginx.conf - #Vuls Install ENV VULS_ROOT /opt/vuls RUN mkdir -p /var/log/vuls ${VULS_ROOT}/conf /root/.ssh/ @@ -77,13 +55,19 @@ RUN chmod 755 ${VULS_ROOT}/scripts/* #Vulrepo Install -RUN git clone https://github.com/usiusi360/vulsrepo /tmp/vulsrepo -RUN mkdir /usr/share/nginx/html/vulsrepo/ -RUN cp -rp /tmp/vulsrepo/dist/* /usr/share/nginx/html/vulsrepo -RUN rm -rf /tmp/vulsrepo +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + apache2 \ + libcgi-pm-perl \ + libjson-perl \ + && rm -rf /var/lib/apt/lists/* \ + && cd /var/www/html/ \ + && git clone https://github.com/usiusi360/vulsrepo \ + && cp /var/www/html/vulsrepo/dist/cgi/vulsrepo.conf.sample /etc/apache2/conf-enabled/vulsrepo.conf \ + && a2enmod cgid #Home -WORKDIR /opt/vuls EXPOSE 80 443 -CMD ["nginx", "-g", "daemon off;"] +ENTRYPOINT service apache2 start && tail -f /dev/null + diff --git a/setup/docker/dockerfile/nginx.conf b/setup/docker/dockerfile/nginx.conf deleted file mode 100644 index d1276ede..00000000 --- a/setup/docker/dockerfile/nginx.conf +++ /dev/null @@ -1,32 +0,0 @@ - -user root; -worker_processes 1; - -error_log /var/log/nginx/error.log warn; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - - #gzip on; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh b/setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh index 61fe3b94..50b797c7 100644 --- a/setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh +++ b/setup/docker/dockerfile/scripts/scan_for_vulsrepo.sh @@ -4,4 +4,4 @@ VULS_CONF=${VULS_ROOT}/conf NGINX_VULSREPO_ROOT=/usr/share/nginx/html/vulsrepo cd $VULS_ROOT vuls scan -report-json --cve-dictionary-dbpath=${VULS_ROOT}/cve.sqlite3 -config=${VULS_CONF}/config.toml -ln -sf ${VULS_ROOT}/results/current ${NGINX_VULSREPO_ROOT}/current +ln -sf ${VULS_ROOT}/results ${NGINX_VULSREPO_ROOT}/results diff --git a/setup/docker/dockerfile/scripts/update_modules.sh b/setup/docker/dockerfile/scripts/update_modules.sh index 356d4cfb..9cd3b493 100644 --- a/setup/docker/dockerfile/scripts/update_modules.sh +++ b/setup/docker/dockerfile/scripts/update_modules.sh @@ -11,7 +11,6 @@ git pull origin master glide install go install -git clone https://github.com/usiusi360/vulsrepo /tmp/vulsrepo -cp -rp /tmp/vulsrepo/src/* /usr/share/nginx/html/vulsrepo -rm -rf /tmp/vulsrepo +cd /var/www/html/vulsrepo +git pull origin master