From a5f31df22a89cdf08917c0182d49e66a49aff5d3 Mon Sep 17 00:00:00 2001 From: Dan Cassidy <5643061+rux616@users.noreply.github.com> Date: Wed, 22 Apr 2020 00:14:57 +0000 Subject: [PATCH 1/8] dos2unix Dockerfile --- Dockerfile | 256 ++++++++++++++++++++++++++--------------------------- 1 file changed, 128 insertions(+), 128 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d104c9..8681422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,128 +1,128 @@ -FROM debian:stretch - -ENV DEBIAN_FRONTEND=noninteractive \ - OV_PASSWORD=admin - -#Install Prerequisites -RUN apt-get update -y && \ - apt-get install locales -y && \ - export LANGUAGE=en_US.UTF-8 && \ - export LANG=en_US.UTF-8 && \ - export LC_ALL=en_US.UTF-8 && \ - locale-gen en_US.UTF-8 && \ - dpkg-reconfigure locales - -RUN apt-get install git zip bzip2 net-tools \ - wget rsync curl cron \ - nmap \ - gcc cmake gcc-mingw-w64 clang clang-format perl-base \ - pkg-config libssh-gcrypt-dev libgnutls28-dev libglib2.0-dev uuid-dev libldap2-dev \ - libpcap-dev libgpgme-dev bison flex libksba-dev libsnmp-dev libgcrypt20-dev \ - redis-server redis-tools libhiredis-dev libmicrohttpd-dev gettext \ - doxygen xmltoman libfreeradius-dev apt-transport-https haveged \ - heimdal-dev libpopt-dev libxml2-dev libical-dev gnutls-bin xsltproc python3-lxml \ - python-impacket python-polib python3-setuptools python-defusedxml python3-paramiko python3-redis python3-dev \ - texlive-latex-base xmlstarlet nsis gnupg snmp smbclient \ - sqlfairy libsqlite3-dev libpq-dev fakeroot sshpass socat \ - --no-install-recommends --fix-missing -yq && \ - curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - curl --silent --show-error https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - echo "deb https://deb.nodesource.com/node_8.x stretch main" | tee /etc/apt/sources.list.d/nodesource.list && \ - apt update -y && \ - apt-get install nodejs yarn --no-install-recommends --fix-missing -yq && \ - apt autoremove -y && \ - rm -rf /var/lib/apt/lists/* - - -#Build gvm-libs -RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/gvm-libs/archive/v10.0.0.tar.gz && \ - tar -zxf v10.0.0.tar.gz && \ - cd gvm-libs-10.0.0 && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm /usr/src/v10.0.0.tar.gz && \ - rm -rf /usr/src/gvm-libs-10.0.0 - -#Build openvas-smb -RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/openvas-smb/archive/v1.0.5.tar.gz && \ - tar -zxf v1.0.5.tar.gz && \ - cd openvas-smb-1.0.5 && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm /usr/src/v1.0.5.tar.gz && \ - rm -rf /usr/src/openvas-smb-1.0.5 - -#Build openvas -RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/openvas/archive/v6.0.0.tar.gz && \ - tar -zxf v6.0.0.tar.gz && \ - cd openvas-6.0.0 && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm /usr/src/v6.0.0.tar.gz && \ - rm -rf /usr/src/openvas-6.0.0 -COPY ./config/openvassd.conf /usr/local/etc/openvas/openvassd.conf -COPY ./config/redis.conf /etc/redis.conf - -#Build gsa -RUN cd /usr/src && \ - git clone -b gsa-8.0 https://github.com/greenbone/gsa.git && \ - cd gsa && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm -rf /usr/src/gsa - -#Build gvmd -RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/gvmd/archive/v8.0.0.tar.gz && \ - tar -zxf v8.0.0.tar.gz && \ - cd gvmd-8.0.0 && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm /usr/src/v8.0.0.tar.gz && \ - rm -rf /usr/src/gvmd-8.0.0 - -#Build ospd -RUN cd /usr/src && \ - git clone https://github.com/greenbone/ospd.git && \ - cd ospd && \ - git checkout "36027d4c3a74c8bdec2cc49410b3fd0fa4b746c3" && \ - python3 setup.py install && \ - rm -rf /usr/src/ospd - -#Build ospd-openvas -RUN cd /usr/src && \ - git clone https://github.com/greenbone/ospd-openvas.git && \ - cd ospd-openvas && \ - git checkout "3f6d407b1b81c1b8b2d9482847270d74784a3928" && \ - python3 setup.py install && \ - rm -rf /usr/src/ospd-openvas - -COPY ./scripts/greenbone-*.sh /usr/local/bin/ -RUN chmod +x /usr/local/bin/greenbone-*.sh - -RUN /usr/local/bin/greenbone-sync.sh - -COPY ./scripts/docker-entrypoint.sh /usr/local/bin -RUN chmod +x /usr/local/bin/docker-entrypoint.sh -ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] - -EXPOSE 80 443 9390 9391 9392 +FROM debian:stretch + +ENV DEBIAN_FRONTEND=noninteractive \ + OV_PASSWORD=admin + +#Install Prerequisites +RUN apt-get update -y && \ + apt-get install locales -y && \ + export LANGUAGE=en_US.UTF-8 && \ + export LANG=en_US.UTF-8 && \ + export LC_ALL=en_US.UTF-8 && \ + locale-gen en_US.UTF-8 && \ + dpkg-reconfigure locales + +RUN apt-get install git zip bzip2 net-tools \ + wget rsync curl cron \ + nmap \ + gcc cmake gcc-mingw-w64 clang clang-format perl-base \ + pkg-config libssh-gcrypt-dev libgnutls28-dev libglib2.0-dev uuid-dev libldap2-dev \ + libpcap-dev libgpgme-dev bison flex libksba-dev libsnmp-dev libgcrypt20-dev \ + redis-server redis-tools libhiredis-dev libmicrohttpd-dev gettext \ + doxygen xmltoman libfreeradius-dev apt-transport-https haveged \ + heimdal-dev libpopt-dev libxml2-dev libical-dev gnutls-bin xsltproc python3-lxml \ + python-impacket python-polib python3-setuptools python-defusedxml python3-paramiko python3-redis python3-dev \ + texlive-latex-base xmlstarlet nsis gnupg snmp smbclient \ + sqlfairy libsqlite3-dev libpq-dev fakeroot sshpass socat \ + --no-install-recommends --fix-missing -yq && \ + curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ + echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ + curl --silent --show-error https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ + echo "deb https://deb.nodesource.com/node_8.x stretch main" | tee /etc/apt/sources.list.d/nodesource.list && \ + apt update -y && \ + apt-get install nodejs yarn --no-install-recommends --fix-missing -yq && \ + apt autoremove -y && \ + rm -rf /var/lib/apt/lists/* + + +#Build gvm-libs +RUN cd /usr/src && \ + wget -nv https://github.com/greenbone/gvm-libs/archive/v10.0.0.tar.gz && \ + tar -zxf v10.0.0.tar.gz && \ + cd gvm-libs-10.0.0 && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm /usr/src/v10.0.0.tar.gz && \ + rm -rf /usr/src/gvm-libs-10.0.0 + +#Build openvas-smb +RUN cd /usr/src && \ + wget -nv https://github.com/greenbone/openvas-smb/archive/v1.0.5.tar.gz && \ + tar -zxf v1.0.5.tar.gz && \ + cd openvas-smb-1.0.5 && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm /usr/src/v1.0.5.tar.gz && \ + rm -rf /usr/src/openvas-smb-1.0.5 + +#Build openvas +RUN cd /usr/src && \ + wget -nv https://github.com/greenbone/openvas/archive/v6.0.0.tar.gz && \ + tar -zxf v6.0.0.tar.gz && \ + cd openvas-6.0.0 && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm /usr/src/v6.0.0.tar.gz && \ + rm -rf /usr/src/openvas-6.0.0 +COPY ./config/openvassd.conf /usr/local/etc/openvas/openvassd.conf +COPY ./config/redis.conf /etc/redis.conf + +#Build gsa +RUN cd /usr/src && \ + git clone -b gsa-8.0 https://github.com/greenbone/gsa.git && \ + cd gsa && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm -rf /usr/src/gsa + +#Build gvmd +RUN cd /usr/src && \ + wget -nv https://github.com/greenbone/gvmd/archive/v8.0.0.tar.gz && \ + tar -zxf v8.0.0.tar.gz && \ + cd gvmd-8.0.0 && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm /usr/src/v8.0.0.tar.gz && \ + rm -rf /usr/src/gvmd-8.0.0 + +#Build ospd +RUN cd /usr/src && \ + git clone https://github.com/greenbone/ospd.git && \ + cd ospd && \ + git checkout "36027d4c3a74c8bdec2cc49410b3fd0fa4b746c3" && \ + python3 setup.py install && \ + rm -rf /usr/src/ospd + +#Build ospd-openvas +RUN cd /usr/src && \ + git clone https://github.com/greenbone/ospd-openvas.git && \ + cd ospd-openvas && \ + git checkout "3f6d407b1b81c1b8b2d9482847270d74784a3928" && \ + python3 setup.py install && \ + rm -rf /usr/src/ospd-openvas + +COPY ./scripts/greenbone-*.sh /usr/local/bin/ +RUN chmod +x /usr/local/bin/greenbone-*.sh + +RUN /usr/local/bin/greenbone-sync.sh + +COPY ./scripts/docker-entrypoint.sh /usr/local/bin +RUN chmod +x /usr/local/bin/docker-entrypoint.sh +ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] + +EXPOSE 80 443 9390 9391 9392 From 35882bbdf295d05a5795e9530185457f331ba2f8 Mon Sep 17 00:00:00 2001 From: Dan Cassidy <5643061+rux616@users.noreply.github.com> Date: Wed, 22 Apr 2020 00:25:53 +0000 Subject: [PATCH 2/8] remove trailing whitespace --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8681422..6e078bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -y && \ export LC_ALL=en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \ dpkg-reconfigure locales - + RUN apt-get install git zip bzip2 net-tools \ wget rsync curl cron \ nmap \ @@ -34,7 +34,7 @@ RUN apt-get install git zip bzip2 net-tools \ apt autoremove -y && \ rm -rf /var/lib/apt/lists/* - + #Build gvm-libs RUN cd /usr/src && \ wget -nv https://github.com/greenbone/gvm-libs/archive/v10.0.0.tar.gz && \ @@ -46,7 +46,7 @@ RUN cd /usr/src && \ make && \ make install && \ rm /usr/src/v10.0.0.tar.gz && \ - rm -rf /usr/src/gvm-libs-10.0.0 + rm -rf /usr/src/gvm-libs-10.0.0 #Build openvas-smb RUN cd /usr/src && \ @@ -104,7 +104,7 @@ RUN cd /usr/src && \ RUN cd /usr/src && \ git clone https://github.com/greenbone/ospd.git && \ cd ospd && \ - git checkout "36027d4c3a74c8bdec2cc49410b3fd0fa4b746c3" && \ + git checkout "36027d4c3a74c8bdec2cc49410b3fd0fa4b746c3" && \ python3 setup.py install && \ rm -rf /usr/src/ospd From 590077273f3cd8708b851fdd440ca338f508f4d2 Mon Sep 17 00:00:00 2001 From: Dan Cassidy <5643061+rux616@users.noreply.github.com> Date: Wed, 22 Apr 2020 00:27:37 +0000 Subject: [PATCH 3/8] Replaced tabs with spaces --- Dockerfile | 160 ++++++++++++++++++++++++++--------------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e078bd..af50e9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,115 +6,115 @@ ENV DEBIAN_FRONTEND=noninteractive \ #Install Prerequisites RUN apt-get update -y && \ apt-get install locales -y && \ - export LANGUAGE=en_US.UTF-8 && \ - export LANG=en_US.UTF-8 && \ - export LC_ALL=en_US.UTF-8 && \ - locale-gen en_US.UTF-8 && \ - dpkg-reconfigure locales + export LANGUAGE=en_US.UTF-8 && \ + export LANG=en_US.UTF-8 && \ + export LC_ALL=en_US.UTF-8 && \ + locale-gen en_US.UTF-8 && \ + dpkg-reconfigure locales RUN apt-get install git zip bzip2 net-tools \ - wget rsync curl cron \ - nmap \ - gcc cmake gcc-mingw-w64 clang clang-format perl-base \ - pkg-config libssh-gcrypt-dev libgnutls28-dev libglib2.0-dev uuid-dev libldap2-dev \ - libpcap-dev libgpgme-dev bison flex libksba-dev libsnmp-dev libgcrypt20-dev \ - redis-server redis-tools libhiredis-dev libmicrohttpd-dev gettext \ - doxygen xmltoman libfreeradius-dev apt-transport-https haveged \ - heimdal-dev libpopt-dev libxml2-dev libical-dev gnutls-bin xsltproc python3-lxml \ - python-impacket python-polib python3-setuptools python-defusedxml python3-paramiko python3-redis python3-dev \ - texlive-latex-base xmlstarlet nsis gnupg snmp smbclient \ - sqlfairy libsqlite3-dev libpq-dev fakeroot sshpass socat \ - --no-install-recommends --fix-missing -yq && \ - curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - curl --silent --show-error https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ - echo "deb https://deb.nodesource.com/node_8.x stretch main" | tee /etc/apt/sources.list.d/nodesource.list && \ - apt update -y && \ - apt-get install nodejs yarn --no-install-recommends --fix-missing -yq && \ - apt autoremove -y && \ - rm -rf /var/lib/apt/lists/* + wget rsync curl cron \ + nmap \ + gcc cmake gcc-mingw-w64 clang clang-format perl-base \ + pkg-config libssh-gcrypt-dev libgnutls28-dev libglib2.0-dev uuid-dev libldap2-dev \ + libpcap-dev libgpgme-dev bison flex libksba-dev libsnmp-dev libgcrypt20-dev \ + redis-server redis-tools libhiredis-dev libmicrohttpd-dev gettext \ + doxygen xmltoman libfreeradius-dev apt-transport-https haveged \ + heimdal-dev libpopt-dev libxml2-dev libical-dev gnutls-bin xsltproc python3-lxml \ + python-impacket python-polib python3-setuptools python-defusedxml python3-paramiko python3-redis python3-dev \ + texlive-latex-base xmlstarlet nsis gnupg snmp smbclient \ + sqlfairy libsqlite3-dev libpq-dev fakeroot sshpass socat \ + --no-install-recommends --fix-missing -yq && \ + curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ + echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ + curl --silent --show-error https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ + echo "deb https://deb.nodesource.com/node_8.x stretch main" | tee /etc/apt/sources.list.d/nodesource.list && \ + apt update -y && \ + apt-get install nodejs yarn --no-install-recommends --fix-missing -yq && \ + apt autoremove -y && \ + rm -rf /var/lib/apt/lists/* #Build gvm-libs RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/gvm-libs/archive/v10.0.0.tar.gz && \ - tar -zxf v10.0.0.tar.gz && \ - cd gvm-libs-10.0.0 && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm /usr/src/v10.0.0.tar.gz && \ - rm -rf /usr/src/gvm-libs-10.0.0 + wget -nv https://github.com/greenbone/gvm-libs/archive/v10.0.0.tar.gz && \ + tar -zxf v10.0.0.tar.gz && \ + cd gvm-libs-10.0.0 && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm /usr/src/v10.0.0.tar.gz && \ + rm -rf /usr/src/gvm-libs-10.0.0 #Build openvas-smb RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/openvas-smb/archive/v1.0.5.tar.gz && \ - tar -zxf v1.0.5.tar.gz && \ - cd openvas-smb-1.0.5 && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm /usr/src/v1.0.5.tar.gz && \ - rm -rf /usr/src/openvas-smb-1.0.5 + wget -nv https://github.com/greenbone/openvas-smb/archive/v1.0.5.tar.gz && \ + tar -zxf v1.0.5.tar.gz && \ + cd openvas-smb-1.0.5 && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm /usr/src/v1.0.5.tar.gz && \ + rm -rf /usr/src/openvas-smb-1.0.5 #Build openvas RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/openvas/archive/v6.0.0.tar.gz && \ - tar -zxf v6.0.0.tar.gz && \ - cd openvas-6.0.0 && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm /usr/src/v6.0.0.tar.gz && \ - rm -rf /usr/src/openvas-6.0.0 + wget -nv https://github.com/greenbone/openvas/archive/v6.0.0.tar.gz && \ + tar -zxf v6.0.0.tar.gz && \ + cd openvas-6.0.0 && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm /usr/src/v6.0.0.tar.gz && \ + rm -rf /usr/src/openvas-6.0.0 COPY ./config/openvassd.conf /usr/local/etc/openvas/openvassd.conf COPY ./config/redis.conf /etc/redis.conf #Build gsa RUN cd /usr/src && \ - git clone -b gsa-8.0 https://github.com/greenbone/gsa.git && \ - cd gsa && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm -rf /usr/src/gsa + git clone -b gsa-8.0 https://github.com/greenbone/gsa.git && \ + cd gsa && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm -rf /usr/src/gsa #Build gvmd RUN cd /usr/src && \ wget -nv https://github.com/greenbone/gvmd/archive/v8.0.0.tar.gz && \ - tar -zxf v8.0.0.tar.gz && \ - cd gvmd-8.0.0 && \ - mkdir build && \ - cd build && \ - cmake .. && \ - make && \ - make install && \ - rm /usr/src/v8.0.0.tar.gz && \ - rm -rf /usr/src/gvmd-8.0.0 + tar -zxf v8.0.0.tar.gz && \ + cd gvmd-8.0.0 && \ + mkdir build && \ + cd build && \ + cmake .. && \ + make && \ + make install && \ + rm /usr/src/v8.0.0.tar.gz && \ + rm -rf /usr/src/gvmd-8.0.0 #Build ospd RUN cd /usr/src && \ git clone https://github.com/greenbone/ospd.git && \ - cd ospd && \ - git checkout "36027d4c3a74c8bdec2cc49410b3fd0fa4b746c3" && \ - python3 setup.py install && \ - rm -rf /usr/src/ospd + cd ospd && \ + git checkout "36027d4c3a74c8bdec2cc49410b3fd0fa4b746c3" && \ + python3 setup.py install && \ + rm -rf /usr/src/ospd #Build ospd-openvas RUN cd /usr/src && \ git clone https://github.com/greenbone/ospd-openvas.git && \ - cd ospd-openvas && \ - git checkout "3f6d407b1b81c1b8b2d9482847270d74784a3928" && \ - python3 setup.py install && \ - rm -rf /usr/src/ospd-openvas + cd ospd-openvas && \ + git checkout "3f6d407b1b81c1b8b2d9482847270d74784a3928" && \ + python3 setup.py install && \ + rm -rf /usr/src/ospd-openvas COPY ./scripts/greenbone-*.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/greenbone-*.sh From 171027ce11518855391e4d9dc04ade771d3d6b13 Mon Sep 17 00:00:00 2001 From: Dan Cassidy <5643061+rux616@users.noreply.github.com> Date: Wed, 22 Apr 2020 00:51:03 +0000 Subject: [PATCH 4/8] Updated Dockerfile with latest release versions --- Dockerfile | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index af50e9f..d70cba2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,16 +37,16 @@ RUN apt-get install git zip bzip2 net-tools \ #Build gvm-libs RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/gvm-libs/archive/v10.0.0.tar.gz && \ - tar -zxf v10.0.0.tar.gz && \ - cd gvm-libs-10.0.0 && \ + wget -nv https://github.com/greenbone/gvm-libs/archive/v10.0.1.tar.gz && \ + tar -zxf v10.0.1.tar.gz && \ + cd gvm-libs-10.0.1 && \ mkdir build && \ cd build && \ cmake .. && \ make && \ make install && \ - rm /usr/src/v10.0.0.tar.gz && \ - rm -rf /usr/src/gvm-libs-10.0.0 + rm /usr/src/v10.0.1.tar.gz && \ + rm -rf /usr/src/gvm-libs-10.0.1 #Build openvas-smb RUN cd /usr/src && \ @@ -63,50 +63,53 @@ RUN cd /usr/src && \ #Build openvas RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/openvas/archive/v6.0.0.tar.gz && \ - tar -zxf v6.0.0.tar.gz && \ - cd openvas-6.0.0 && \ + wget -nv https://github.com/greenbone/openvas/archive/v6.0.1.tar.gz && \ + tar -zxf v6.0.1.tar.gz && \ + cd openvas-6.0.1 && \ mkdir build && \ cd build && \ cmake .. && \ make && \ make install && \ - rm /usr/src/v6.0.0.tar.gz && \ - rm -rf /usr/src/openvas-6.0.0 + rm /usr/src/v6.0.1.tar.gz && \ + rm -rf /usr/src/openvas-6.0.1 COPY ./config/openvassd.conf /usr/local/etc/openvas/openvassd.conf COPY ./config/redis.conf /etc/redis.conf #Build gsa RUN cd /usr/src && \ - git clone -b gsa-8.0 https://github.com/greenbone/gsa.git && \ - cd gsa && \ + wget -nv https://github.com/greenbone/gsa/archive/v8.0.1.tar.gz && \ + tar -zxf v8.0.1.tar.gz && \ + cd gsa-8.0.1 && \ mkdir build && \ cd build && \ cmake .. && \ make && \ make install && \ - rm -rf /usr/src/gsa + rm /usr/src/v8.0.1.tar.gz && \ + rm -rf /usr/src/gsa-8.0.1 #Build gvmd RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/gvmd/archive/v8.0.0.tar.gz && \ - tar -zxf v8.0.0.tar.gz && \ - cd gvmd-8.0.0 && \ + wget -nv https://github.com/greenbone/gvmd/archive/v8.0.1.tar.gz && \ + tar -zxf v8.0.1.tar.gz && \ + cd gvmd-8.0.1 && \ mkdir build && \ cd build && \ cmake .. && \ make && \ make install && \ - rm /usr/src/v8.0.0.tar.gz && \ - rm -rf /usr/src/gvmd-8.0.0 + rm /usr/src/v8.0.1.tar.gz && \ + rm -rf /usr/src/gvmd-8.0.1 #Build ospd RUN cd /usr/src && \ - git clone https://github.com/greenbone/ospd.git && \ - cd ospd && \ - git checkout "36027d4c3a74c8bdec2cc49410b3fd0fa4b746c3" && \ + wget -nv https://github.com/greenbone/ospd/archive/v1.3.2.tar.gz && \ + tar -zxf v1.3.2.tar.gz && \ + cd ospd-1.3.2 && \ python3 setup.py install && \ - rm -rf /usr/src/ospd + rm /usr/src/v1.3.2.tar.gz && \ + rm -rf /usr/src/ospd-1.3.2 #Build ospd-openvas RUN cd /usr/src && \ From 3928ea6641082fc273bc15984a7a731521d9538c Mon Sep 17 00:00:00 2001 From: Dan Cassidy <5643061+rux616@users.noreply.github.com> Date: Wed, 22 Apr 2020 04:17:55 +0000 Subject: [PATCH 5/8] Multiple updates - Update base image to debian buster - Adjust apt-get calls - Update ospd to v2.0.0 - Update ospd-openvas to v1.0.0 --- Dockerfile | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index d70cba2..81e23cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,19 @@ -FROM debian:stretch +FROM debian:buster ENV DEBIAN_FRONTEND=noninteractive \ OV_PASSWORD=admin #Install Prerequisites RUN apt-get update -y && \ - apt-get install locales -y && \ + apt-get install -y apt-utils locales && \ export LANGUAGE=en_US.UTF-8 && \ export LANG=en_US.UTF-8 && \ export LC_ALL=en_US.UTF-8 && \ locale-gen en_US.UTF-8 && \ dpkg-reconfigure locales -RUN apt-get install git zip bzip2 net-tools \ +RUN apt-get install --assume-yes --quiet --no-install-recommends --fix-missing \ + git zip bzip2 net-tools \ wget rsync curl cron \ nmap \ gcc cmake gcc-mingw-w64 clang clang-format perl-base \ @@ -23,8 +24,7 @@ RUN apt-get install git zip bzip2 net-tools \ heimdal-dev libpopt-dev libxml2-dev libical-dev gnutls-bin xsltproc python3-lxml \ python-impacket python-polib python3-setuptools python-defusedxml python3-paramiko python3-redis python3-dev \ texlive-latex-base xmlstarlet nsis gnupg snmp smbclient \ - sqlfairy libsqlite3-dev libpq-dev fakeroot sshpass socat \ - --no-install-recommends --fix-missing -yq && \ + sqlfairy libsqlite3-dev libpq-dev fakeroot sshpass socat && \ curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ curl --silent --show-error https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ @@ -104,20 +104,21 @@ RUN cd /usr/src && \ #Build ospd RUN cd /usr/src && \ - wget -nv https://github.com/greenbone/ospd/archive/v1.3.2.tar.gz && \ - tar -zxf v1.3.2.tar.gz && \ - cd ospd-1.3.2 && \ + wget -nv https://github.com/greenbone/ospd/archive/v2.0.0.tar.gz && \ + tar -zxf v2.0.0.tar.gz && \ + cd ospd-2.0.0 && \ python3 setup.py install && \ - rm /usr/src/v1.3.2.tar.gz && \ - rm -rf /usr/src/ospd-1.3.2 + rm /usr/src/v2.0.0.tar.gz && \ + rm -rf /usr/src/ospd-2.0.0 #Build ospd-openvas RUN cd /usr/src && \ - git clone https://github.com/greenbone/ospd-openvas.git && \ - cd ospd-openvas && \ - git checkout "3f6d407b1b81c1b8b2d9482847270d74784a3928" && \ + wget -nv https://github.com/greenbone/ospd-openvas/archive/v1.0.0.tar.gz && \ + tar -zxf v1.0.0.tar.gz && \ + cd ospd-openvas-1.0.0 && \ python3 setup.py install && \ - rm -rf /usr/src/ospd-openvas + rm /usr/src/v1.0.0.tar.gz && \ + rm -rf /usr/src/ospd-openvas-1.0.0 COPY ./scripts/greenbone-*.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/greenbone-*.sh From 481197602b3f16db0b5a4c289955ff1dd7af0186 Mon Sep 17 00:00:00 2001 From: Dan Cassidy <5643061+rux616@users.noreply.github.com> Date: Wed, 22 Apr 2020 15:37:25 +0000 Subject: [PATCH 6/8] Fix indenting --- Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81e23cb..7641c90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,18 +13,18 @@ RUN apt-get update -y && \ dpkg-reconfigure locales RUN apt-get install --assume-yes --quiet --no-install-recommends --fix-missing \ - git zip bzip2 net-tools \ - wget rsync curl cron \ - nmap \ - gcc cmake gcc-mingw-w64 clang clang-format perl-base \ - pkg-config libssh-gcrypt-dev libgnutls28-dev libglib2.0-dev uuid-dev libldap2-dev \ - libpcap-dev libgpgme-dev bison flex libksba-dev libsnmp-dev libgcrypt20-dev \ - redis-server redis-tools libhiredis-dev libmicrohttpd-dev gettext \ - doxygen xmltoman libfreeradius-dev apt-transport-https haveged \ - heimdal-dev libpopt-dev libxml2-dev libical-dev gnutls-bin xsltproc python3-lxml \ - python-impacket python-polib python3-setuptools python-defusedxml python3-paramiko python3-redis python3-dev \ - texlive-latex-base xmlstarlet nsis gnupg snmp smbclient \ - sqlfairy libsqlite3-dev libpq-dev fakeroot sshpass socat && \ + git zip bzip2 net-tools \ + wget rsync curl cron \ + nmap \ + gcc cmake gcc-mingw-w64 clang clang-format perl-base \ + pkg-config libssh-gcrypt-dev libgnutls28-dev libglib2.0-dev uuid-dev libldap2-dev \ + libpcap-dev libgpgme-dev bison flex libksba-dev libsnmp-dev libgcrypt20-dev \ + redis-server redis-tools libhiredis-dev libmicrohttpd-dev gettext \ + doxygen xmltoman libfreeradius-dev apt-transport-https haveged \ + heimdal-dev libpopt-dev libxml2-dev libical-dev gnutls-bin xsltproc python3-lxml \ + python-impacket python-polib python3-setuptools python-defusedxml python3-paramiko python3-redis python3-dev \ + texlive-latex-base xmlstarlet nsis gnupg snmp smbclient \ + sqlfairy libsqlite3-dev libpq-dev fakeroot sshpass socat && \ curl --silent --show-error https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ curl --silent --show-error https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \ From bc6b8c067ba1ae501b47a1d767ea552cf10db91e Mon Sep 17 00:00:00 2001 From: Dan Cassidy <5643061+rux616@users.noreply.github.com> Date: Thu, 23 Apr 2020 00:53:03 +0000 Subject: [PATCH 7/8] Fix wrong volume mount path for data --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 83bd894..bd0c725 100644 --- a/README.md +++ b/README.md @@ -58,10 +58,10 @@ docker run -d -p 443:443 -p 9390:9390 --name openvas ctdc/openvas ``` #### Volume Support -We now support volumes. Simply mount your data directory to `/var/lib/openvas/mgr/`: +We now support volumes. Simply mount your data directory to `/usr/local/var/lib/gvm/`: ``` mkdir data -docker run -d -p 443:443 -v $(pwd)/data:/var/lib/openvas/mgr/ --name openvas ctdc/openvas +docker run -d -p 443:443 -v $(pwd)/data:/usr/local/var/lib/gvm/ --name openvas ctdc/openvas ``` Note, your local directory must exist prior to running. From dda4b89431ded63e96e619dfb436edff7363d3b9 Mon Sep 17 00:00:00 2001 From: Dan Cassidy <5643061+rux616@users.noreply.github.com> Date: Thu, 23 Apr 2020 00:57:43 +0000 Subject: [PATCH 8/8] Updated changelog --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ff94ca..12ae097 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## 10.0.1 - 2020-04-23 + +### Changed +- Reversioning based on how Greenbone versions their releases (using gvm-libs) +- Now built on Debian 10 Buster + +### Fixed +- Should fix the SIGSEGV fault happening in openvasd sometimes (greenbone/openvas#336) + +### Packaged versions +- gsa [v8.0.1](https://github.com/greenbone/gsa/releases/tag/v8.0.1) +- gvmd [v8.0.1](https://github.com/greenbone/gvmd/releases/tag/v8.0.1) +- gvm-libs [v10.0.1](https://github.com/greenbone/gvm-libs/releases/tag/v10.0.1) +- openvas-smb [v1.0.5](https://github.com/greenbone/openvas-smb/releases/tag/v1.0.5) +- openvas [v6.0.1](https://github.com/greenbone/openvas/releases/tag/v6.0.1) +- ospd [v2.0.0](https://github.com/greenbone/ospd/releases/tag/v2.0.0) +- ospd-openvas [v1.0.0](https://github.com/greenbone/ospd-openvas/releases/tag/v1.0.0) + ## 8.0.0 - 2019-06-24 ### Packaged versions