diff --git a/docker/code-analysis/Dockerfile b/docker/code-analysis/Dockerfile index 9dd91881cad487d6c57d02bf35d5e93955ffb4d0..f17c2aa4db8ee860144265fba15a68e16b99c575 100644 --- a/docker/code-analysis/Dockerfile +++ b/docker/code-analysis/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL maintainer="suru.dissanaike@iopsys.eu" LABEL build="docker build -t code-analysis ." @@ -74,8 +74,8 @@ RUN mkdir /opt/dev RUN mkdir /etc/config # install node -ENV NODE_VERSION=12.14.1 -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash +ENV NODE_VERSION=14.16.1 +RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash ENV NVM_DIR=/root/.nvm RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION} RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION} @@ -210,19 +210,6 @@ RUN \ wget https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.19.0/pmd-bin-6.19.0.zip && \ unzip pmd-bin-6.19.0.zip -# libwebsockets -RUN \ - cd /opt/dev && \ - git clone https://github.com/warmcat/libwebsockets.git && \ - cd libwebsockets && \ - git checkout 89eedcaa94e1c8a97ea3af10642fd224bcea068f && \ - mkdir build && \ - cd build && \ - cmake .. -DCMAKE_SKIP_RPATH=TRUE -DLWS_IPV6=ON -DLWS_WITHOUT_TESTAPPS=ON -DLWS_WITH_SSL=ON -DLWS_OPENSSL_CLIENT_CERTS=/etc/ssl/certs -DLWS_OPENSSL_SUPPORT=ON -DLWS_WITH_SSL=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_PLUGINS=ON -DLWS_WITH_SERVER_STATUS=ON -DLWS_WITH_ACCESS_LOG=ON -DLWS_WITH_CGI=ON && \ - make && \ - sudo make install && \ - sudo ldconfig - # microxml RUN \ cd /opt/dev && \