Merge pull request ElektraInitiative#3838 from mpranj/webdeps

tucek · May 11, 2021 · 7526f9a · 7526f9a
2 parents c5f42de + 424c1da
commit 7526f9a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 132 deletions.
diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md
@@ -150,6 +150,7 @@ you up to date with the multi-language support provided by Elektra.
 - Update specmount error message _(@a-kraschitzer)_
 - Update `elektraMemDup` to `void *` and update the documentation. _(Mihael Pranjić)_
 - There have been a few bugfixes for elektrad. _(Klemens Böswirth)_
+- Update `lodash` and `hosted-git-info` dependencies of `webd` due to security update. _(Mihael Pranjić)_
 - <<TODO>>
 - <<TODO>>
 
@@ -247,6 +248,7 @@ plugins, bindings and tools are always up to date. Furthermore, we changed:
 - Catch errors when code highlighting fails. _(Mihael Pranjić)_
 - Get rid of unused code: authentication, backend, users, snippets and conversion service. _(Mihael Pranjić)_
 - Fix docsearch sourcemap error. _(Mihael Pranjić)_
+- Update `lodash` dependency due to security update. _(Mihael Pranjić)_
 - <<TODO>>
 - <<TODO>>
 

diff --git a/scripts/docker/website/Dockerfile b/scripts/docker/website/Dockerfile
@@ -26,7 +26,7 @@ ARG PARALLEL=8
 ENV C_FLAGS="-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-protector-strong -Wstack-protector -fPIE -pie"
 WORKDIR /app/kdb
 ADD . /app/kdb/
-RUN mkdir build \
+RUN mkdir -p build \
     && cd build \
     && cmake -DBUILD_FULL=OFF -DBUILD_SHARED=ON \
              -DBUILD_STATIC=OFF -DBUILD_DOCUMENTATION=OFF \

diff --git a/scripts/docker/webui/base/Dockerfile b/scripts/docker/webui/base/Dockerfile
@@ -31,7 +31,7 @@ WORKDIR /home/elektra/libelektra
 ADD . /home/elektra/libelektra/
 
 # build & install libelektra
-RUN mkdir /home/elektra/libelektra/build
+RUN mkdir -p /home/elektra/libelektra/build
 WORKDIR /home/elektra/libelektra/build
 RUN cmake .. -DTOOLS="kdb;web" && make -j ${PARALLEL} && make install
 

diff --git a/scripts/docker/webui/web/Dockerfile b/scripts/docker/webui/web/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /home/elektra
 USER elektra
 
 # create start script
-RUN printf "#!/bin/bash\nkdb run-elektrad &\nkdb run-web" > start
+RUN printf "#!/bin/bash\nkdb run-elektrad &\nkdb run-webd" > start
 RUN chmod +x start
 
 # run elektrad and webd in one container

diff --git a/scripts/docker/webui/webd/Dockerfile b/scripts/docker/webui/webd/Dockerfile
@@ -7,4 +7,4 @@ USER elektra
 
 # run webd (serves client)
 EXPOSE 33334
-CMD ["kdb","run-web"]
+CMD ["kdb","run-webd"]
diff --git a/src/tools/webd/package-lock.json b/src/tools/webd/package-lock.json
diff --git a/src/tools/website/package-lock.json b/src/tools/website/package-lock.json