Эх сурвалжийг харах

Some QoL Stuff (#5604)

* Some QoL Stuff

* fix apt warnings -> apt-get

* tag broken frameworks

* tag broken frameworks

* tag broken frameworks

* tag broken frameworks
Nate 5 жил өмнө
parent
commit
623418289e
100 өөрчлөгдсөн 221 нэмэгдсэн , 213 устгасан
  1. 2 2
      deployment/vagrant/bootstrap.sh
  2. 3 3
      frameworks/C++/cpoll_cppsp/cpoll_cppsp-postgres-raw-threadpool.dockerfile
  3. 3 3
      frameworks/C++/cpoll_cppsp/cpoll_cppsp-postgres-raw.dockerfile
  4. 3 3
      frameworks/C++/cpoll_cppsp/cpoll_cppsp-raw.dockerfile
  5. 2 2
      frameworks/C++/cpoll_cppsp/cpoll_cppsp.dockerfile
  6. 2 2
      frameworks/C++/cppcms/cppcms-direct.dockerfile
  7. 2 2
      frameworks/C++/cppcms/cppcms-postgres.dockerfile
  8. 2 2
      frameworks/C++/cppcms/cppcms.dockerfile
  9. 2 2
      frameworks/C++/cutelyst/build.sh
  10. 2 2
      frameworks/C++/cutelyst/cutelyst-nginx-my.dockerfile
  11. 2 2
      frameworks/C++/cutelyst/cutelyst-nginx-pg.dockerfile
  12. 2 2
      frameworks/C++/cutelyst/cutelyst-nginx.dockerfile
  13. 2 2
      frameworks/C++/cutelyst/cutelyst-pf-my-nodelay.dockerfile
  14. 2 2
      frameworks/C++/cutelyst/cutelyst-pf-my.dockerfile
  15. 2 2
      frameworks/C++/cutelyst/cutelyst-pf-nodelay.dockerfile
  16. 2 2
      frameworks/C++/cutelyst/cutelyst-pf-pg-nodelay.dockerfile
  17. 2 2
      frameworks/C++/cutelyst/cutelyst-pf-pg.dockerfile
  18. 2 2
      frameworks/C++/cutelyst/cutelyst-thread-my-grantlee.dockerfile
  19. 2 2
      frameworks/C++/cutelyst/cutelyst-thread-my-nodelay.dockerfile
  20. 2 2
      frameworks/C++/cutelyst/cutelyst-thread-my.dockerfile
  21. 2 2
      frameworks/C++/cutelyst/cutelyst-thread-nodelay.dockerfile
  22. 2 2
      frameworks/C++/cutelyst/cutelyst-thread-pg-grantlee.dockerfile
  23. 2 2
      frameworks/C++/cutelyst/cutelyst-thread-pg-nodelay.dockerfile
  24. 2 2
      frameworks/C++/cutelyst/cutelyst-thread-pg.dockerfile
  25. 2 2
      frameworks/C++/cutelyst/cutelyst-thread.dockerfile
  26. 2 2
      frameworks/C++/cutelyst/cutelyst.dockerfile
  27. 4 4
      frameworks/C++/drogon/drogon-core.dockerfile
  28. 4 4
      frameworks/C++/drogon/drogon.dockerfile
  29. 3 3
      frameworks/C++/ffead-cpp/install_ffead-cpp-dependencies.sh
  30. 1 1
      frameworks/C++/libhttpserver/libhttpserver.dockerfile
  31. 2 2
      frameworks/C++/lithium/benchmark_config.json
  32. 2 2
      frameworks/C++/lithium/lithium-mysql.dockerfile
  33. 2 2
      frameworks/C++/lithium/lithium-postgres.dockerfile
  34. 2 2
      frameworks/C++/poco/poco.dockerfile
  35. 4 4
      frameworks/C++/silicon/silicon.dockerfile
  36. 6 6
      frameworks/C++/ulib/ulib-json.dockerfile
  37. 6 6
      frameworks/C++/ulib/ulib-json_fit.dockerfile
  38. 5 5
      frameworks/C++/ulib/ulib-mongodb.dockerfile
  39. 5 5
      frameworks/C++/ulib/ulib-mysql.dockerfile
  40. 6 6
      frameworks/C++/ulib/ulib-plaintext_fit.dockerfile
  41. 5 5
      frameworks/C++/ulib/ulib-postgres.dockerfile
  42. 5 5
      frameworks/C++/ulib/ulib-postgres_fit.dockerfile
  43. 6 6
      frameworks/C++/ulib/ulib.dockerfile
  44. 3 3
      frameworks/C++/wt/wt-postgres.dockerfile
  45. 3 3
      frameworks/C++/wt/wt.dockerfile
  46. 2 2
      frameworks/C/h2o/h2o.dockerfile
  47. 4 4
      frameworks/C/libreactor/libreactor.dockerfile
  48. 2 2
      frameworks/C/lwan/lwan-lua.dockerfile
  49. 2 2
      frameworks/C/lwan/lwan.dockerfile
  50. 2 2
      frameworks/C/octane/octane.dockerfile
  51. 1 1
      frameworks/C/onion/onion.dockerfile
  52. 1 1
      frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx-jn.dockerfile
  53. 1 1
      frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx-my-ef.dockerfile
  54. 1 1
      frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx-my.dockerfile
  55. 1 1
      frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx-ss.dockerfile
  56. 1 1
      frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx.dockerfile
  57. 1 1
      frameworks/CSharp/evhttp-sharp/evhttp-sharp.dockerfile
  58. 1 1
      frameworks/CSharp/revenj/revenj.dockerfile
  59. 1 1
      frameworks/CSharp/servicestack/README.md
  60. 1 1
      frameworks/CSharp/servicestack/servicestack.dockerfile
  61. 1 1
      frameworks/Clojure/macchiato/macchiato.dockerfile
  62. 1 1
      frameworks/Crystal/amber/amber.dockerfile
  63. 2 2
      frameworks/Crystal/h2o.cr/h2o.cr.dockerfile
  64. 1 1
      frameworks/D/hunt/hunt-dmd.dockerfile
  65. 1 1
      frameworks/D/hunt/hunt-http.dockerfile
  66. 1 1
      frameworks/D/hunt/hunt.dockerfile
  67. 1 1
      frameworks/D/vibed/vibed-dmd-pgsql.dockerfile
  68. 1 1
      frameworks/D/vibed/vibed-ldc-pgsql.dockerfile
  69. 1 1
      frameworks/D/vibed/vibed-ldc.dockerfile
  70. 1 1
      frameworks/D/vibed/vibed.dockerfile
  71. 1 1
      frameworks/Dart/start/start.dockerfile
  72. 1 1
      frameworks/Dart/stream/stream.dockerfile
  73. 5 5
      frameworks/Elixir/plug/elixir-plug-ecto.dockerfile
  74. 2 1
      frameworks/Erlang/chicagoboss/benchmark_config.json
  75. 2 2
      frameworks/Haskell/servant/servant-beam.dockerfile
  76. 2 2
      frameworks/Haskell/servant/servant-psql-simple.dockerfile
  77. 2 2
      frameworks/Haskell/servant/servant.dockerfile
  78. 2 2
      frameworks/Haskell/snap/snap.dockerfile
  79. 2 2
      frameworks/Haskell/spock/spock.dockerfile
  80. 2 2
      frameworks/Haskell/warp/warp-shared.dockerfile
  81. 4 2
      frameworks/Haskell/yesod/benchmark_config.json
  82. 2 2
      frameworks/Haskell/yesod/yesod-mongodb-raw.dockerfile
  83. 2 2
      frameworks/Haskell/yesod/yesod.dockerfile
  84. 1 1
      frameworks/Java/play1/play1.dockerfile
  85. 3 3
      frameworks/Java/revenj-jvm/revenj-jvm.dockerfile
  86. 2 2
      frameworks/JavaScript/hapi/hapi-nginx.dockerfile
  87. 1 1
      frameworks/Lua/lapis/lapis.dockerfile
  88. 2 1
      frameworks/Lua/octopus/benchmark_config.json
  89. 1 1
      frameworks/Lua/octopus/octopus.dockerfile
  90. 1 1
      frameworks/Lua/openresty/openresty.dockerfile
  91. 2 1
      frameworks/PHP/peachpie/benchmark_config.json
  92. 2 2
      frameworks/PHP/php/php-h2o.dockerfile
  93. 2 2
      frameworks/PHP/php/php-pgsql-raw.dockerfile
  94. 3 2
      frameworks/Perl/dancer/benchmark_config.json
  95. 1 1
      frameworks/Perl/dancer/dancer.dockerfile
  96. 4 2
      frameworks/Perl/kelp/benchmark_config.json
  97. 1 1
      frameworks/Perl/kelp/kelp-mongodb.dockerfile
  98. 1 1
      frameworks/Perl/kelp/kelp.dockerfile
  99. 1 1
      frameworks/Perl/plack/plack-async.dockerfile
  100. 2 2
      frameworks/Perl/plack/plack.dockerfile

+ 2 - 2
deployment/vagrant/bootstrap.sh

@@ -12,8 +12,8 @@ if [ ! -e "~/.firstboot" ]; then
   echo "Installing docker"
   echo "Installing docker"
   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
   sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
   sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  sudo apt update -yqq
-  sudo apt install -yqq docker-ce
+  sudo apt-get update -yqq
+  sudo apt-get install -yqq docker-ce
   sudo usermod -aG docker vagrant
   sudo usermod -aG docker vagrant
 
 
   # Setting up passwordless sudo
   # Setting up passwordless sudo

+ 3 - 3
frameworks/C++/cpoll_cppsp/cpoll_cppsp-postgres-raw-threadpool.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip
 
 
-RUN apt install -yqq g++-4.8 libjson0-dev
+RUN apt-get install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 
 WORKDIR /installs
 WORKDIR /installs
@@ -18,7 +18,7 @@ RUN mv cppsp_rel$VERSION/ $CPPSP_HOME
 RUN sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
 RUN sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
 RUN sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
 RUN sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
 
 
-RUN apt install -yqq postgresql-server-dev-9.5
+RUN apt-get install -yqq postgresql-server-dev-9.5
 ENV CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.5/server:${CPLUS_INCLUDE_PATH}
 ENV CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.5/server:${CPLUS_INCLUDE_PATH}
 
 
 ADD ./ /cpoll_cppsp
 ADD ./ /cpoll_cppsp

+ 3 - 3
frameworks/C++/cpoll_cppsp/cpoll_cppsp-postgres-raw.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip
 
 
-RUN apt install -yqq g++-4.8 libjson0-dev
+RUN apt-get install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 
 WORKDIR /installs
 WORKDIR /installs
@@ -18,7 +18,7 @@ RUN mv cppsp_rel$VERSION/ $CPPSP_HOME
 RUN sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
 RUN sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
 RUN sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
 RUN sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
 
 
-RUN apt install -yqq postgresql-server-dev-9.5
+RUN apt-get install -yqq postgresql-server-dev-9.5
 ENV CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.5/server:${CPLUS_INCLUDE_PATH}
 ENV CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.5/server:${CPLUS_INCLUDE_PATH}
 
 
 ADD ./ /cpoll_cppsp
 ADD ./ /cpoll_cppsp

+ 3 - 3
frameworks/C++/cpoll_cppsp/cpoll_cppsp-raw.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip
 
 
-RUN apt install -yqq g++-4.8 libjson0-dev
+RUN apt-get install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 
 WORKDIR /installs
 WORKDIR /installs
@@ -18,7 +18,7 @@ RUN mv cppsp_rel$VERSION/ $CPPSP_HOME
 RUN sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
 RUN sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
 RUN sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
 RUN sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
 
 
-RUN apt install -yqq postgresql-server-dev-9.5
+RUN apt-get install -yqq postgresql-server-dev-9.5
 ENV CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.5/server:${CPLUS_INCLUDE_PATH}
 ENV CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.5/server:${CPLUS_INCLUDE_PATH}
 
 
 ADD ./ /cpoll_cppsp
 ADD ./ /cpoll_cppsp

+ 2 - 2
frameworks/C++/cpoll_cppsp/cpoll_cppsp.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip
 
 
-RUN apt install -yqq g++-4.8 libjson0-dev
+RUN apt-get install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 
 WORKDIR /installs
 WORKDIR /installs

+ 2 - 2
frameworks/C++/cppcms/cppcms-direct.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip cmake
 
 
-RUN apt install -yqq libgcrypt11-dev python nginx
+RUN apt-get install -yqq libgcrypt11-dev python nginx
 
 
 WORKDIR /installs
 WORKDIR /installs
 
 

+ 2 - 2
frameworks/C++/cppcms/cppcms-postgres.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip cmake
 
 
-RUN apt install -yqq libgcrypt11-dev python nginx
+RUN apt-get install -yqq libgcrypt11-dev python nginx
 
 
 WORKDIR /installs
 WORKDIR /installs
 
 

+ 2 - 2
frameworks/C++/cppcms/cppcms.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip cmake
 
 
-RUN apt install -yqq libgcrypt11-dev python nginx
+RUN apt-get install -yqq libgcrypt11-dev python nginx
 
 
 WORKDIR /installs
 WORKDIR /installs
 
 

+ 2 - 2
frameworks/C++/cutelyst/build.sh

@@ -2,8 +2,8 @@
 
 
 export CUTELYST_VER=2.4.1
 export CUTELYST_VER=2.4.1
 
 
-apt update -qq && \
-    apt install -yqq --no-install-recommends \
+apt-get update -qq && \
+    apt-get install -yqq --no-install-recommends \
     cmake \
     cmake \
     pkg-config \
     pkg-config \
     clearsilver-dev \
     clearsilver-dev \

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-nginx-my.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-nginx-pg.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-nginx.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-pf-my-nodelay.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-pf-my.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-pf-nodelay.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-pf-pg-nodelay.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-pf-pg.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-thread-my-grantlee.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-thread-my-nodelay.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-thread-my.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-thread-nodelay.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-thread-pg-grantlee.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-thread-pg-nodelay.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-thread-pg.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst-thread.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 2 - 2
frameworks/C++/cutelyst/cutelyst.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:18.04
 FROM ubuntu:18.04
 
 
-RUN apt update -qq && \
-    apt install -yqq locales wget build-essential
+RUN apt-get update -qq && \
+    apt-get install -yqq locales wget build-essential
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANG en_US.UTF-8

+ 4 - 4
frameworks/C++/drogon/drogon-core.dockerfile

@@ -2,16 +2,16 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN  apt update -yqq && \
+RUN  apt-get update -yqq && \
      apt-get install -yqq software-properties-common && \
      apt-get install -yqq software-properties-common && \
-	 apt install -yqq sudo curl wget cmake locales git \
+	 apt-get install -yqq sudo curl wget cmake locales git \
      openssl libssl-dev \
      openssl libssl-dev \
      libjsoncpp-dev \
      libjsoncpp-dev \
      uuid-dev libreadline-dev libbison-dev flex \
      uuid-dev libreadline-dev libbison-dev flex \
      zlib1g-dev && \
      zlib1g-dev && \
      add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
      add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 

+ 4 - 4
frameworks/C++/drogon/drogon.dockerfile

@@ -2,16 +2,16 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN  apt update -yqq && \
+RUN  apt-get update -yqq && \
      apt-get install -yqq software-properties-common && \
      apt-get install -yqq software-properties-common && \
-	 apt install -yqq sudo curl wget cmake locales git \
+	 apt-get install -yqq sudo curl wget cmake locales git \
      openssl libssl-dev \
      openssl libssl-dev \
      libjsoncpp-dev \
      libjsoncpp-dev \
      uuid-dev libreadline-dev libbison-dev flex \
      uuid-dev libreadline-dev libbison-dev flex \
      zlib1g-dev && \
      zlib1g-dev && \
      add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
      add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 

+ 3 - 3
frameworks/C++/ffead-cpp/install_ffead-cpp-dependencies.sh

@@ -2,8 +2,8 @@
 
 
 cd $IROOT
 cd $IROOT
 
 
-apt update -yqq
-apt install -yqq autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make
+apt-get update -yqq
+apt-get install -yqq autoconf-archive unzip uuid-dev odbc-postgresql unixodbc unixodbc-dev apache2 apache2-dev libapr1-dev libaprutil1-dev memcached libmemcached-dev redis-server libssl-dev zlib1g-dev cmake make
 
 
 #redis will not start correctly on bionic with this config
 #redis will not start correctly on bionic with this config
 sed -i "s/bind .*/bind 127.0.0.1/g" /etc/redis/redis.conf
 sed -i "s/bind .*/bind 127.0.0.1/g" /etc/redis/redis.conf
@@ -34,4 +34,4 @@ tar xvf v0.13.3.tar.gz
 cd hiredis-0.13.3/
 cd hiredis-0.13.3/
 make
 make
 PREFIX=/usr make install
 PREFIX=/usr make install
-	
+

+ 1 - 1
frameworks/C++/libhttpserver/libhttpserver.dockerfile

@@ -1,6 +1,6 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip cmake
 
 
 ENV LHT_HOME /libhttpserver
 ENV LHT_HOME /libhttpserver
 
 

+ 2 - 2
frameworks/C++/lithium/benchmark_config.json

@@ -2,7 +2,7 @@
   "framework": "lithium",
   "framework": "lithium",
   "tests": [
   "tests": [
     {
     {
-      "mysql": {
+      "default": {
         "json_url"       : "/json",
         "json_url"       : "/json",
         "db_url"         : "/db",
         "db_url"         : "/db",
         "query_url"      : "/queries?N=",
         "query_url"      : "/queries?N=",
@@ -48,7 +48,7 @@
         "notes": "",
         "notes": "",
         "versus": "None"
         "versus": "None"
       }
       }
-      
+
     }
     }
   ]
   ]
 }
 }

+ 2 - 2
frameworks/C++/lithium/lithium-mysql.dockerfile

@@ -1,7 +1,7 @@
 FROM buildpack-deps:focal
 FROM buildpack-deps:focal
 
 
-RUN apt update -yqq
-RUN apt install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
 
 
 COPY ./ ./
 COPY ./ ./
 
 

+ 2 - 2
frameworks/C++/lithium/lithium-postgres.dockerfile

@@ -1,7 +1,7 @@
 FROM buildpack-deps:focal
 FROM buildpack-deps:focal
 
 
-RUN apt update -yqq
-RUN apt install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
 
 
 COPY ./ ./
 COPY ./ ./
 
 

+ 2 - 2
frameworks/C++/poco/poco.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip cmake
 
 
-RUN apt install -yqq g++-4.8 libjson0-dev
+RUN apt-get install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 
 ENV POCO_VERSION 1.6.1
 ENV POCO_VERSION 1.6.1

+ 4 - 4
frameworks/C++/silicon/silicon.dockerfile

@@ -1,11 +1,11 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip cmake
 
 
 RUN add-apt-repository -s "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-3.9 main"
 RUN add-apt-repository -s "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-3.9 main"
 RUN wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add -
 RUN wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add -
-RUN apt update -yqq
-RUN apt install -yqq clang-3.9 lldb-3.9
+RUN apt-get update -yqq
+RUN apt-get install -yqq clang-3.9 lldb-3.9
 
 
 ENV MICROHTTPD_VERSION=0.9.39
 ENV MICROHTTPD_VERSION=0.9.39
 ENV MICROHTTPD=/libmicrohttpd
 ENV MICROHTTPD=/libmicrohttpd
@@ -19,7 +19,7 @@ RUN cd libmicrohttpd-$MICROHTTPD_VERSION && \
 
 
 ENV PATH=${MICROHTTPD_HOME}/bin:${PATH}
 ENV PATH=${MICROHTTPD_HOME}/bin:${PATH}
 
 
-RUN apt install -yqq libboost-dev cmake
+RUN apt-get install -yqq libboost-dev cmake
 
 
 ENV SILICON=/silicon
 ENV SILICON=/silicon
 
 

+ 6 - 6
frameworks/C++/ulib/ulib-json.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update -yqq && \
-	 apt install -yqq software-properties-common build-essential curl locales wget unzip git \
+RUN apt-get update -yqq && \
+	 apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
     re2c libnuma-dev \
     re2c libnuma-dev \
 	 postgresql-server-dev-all libcap2-bin && \
 	 postgresql-server-dev-all libcap2-bin && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 
@@ -38,14 +38,14 @@ ENV ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
 
 
 WORKDIR $IROOT
 WORKDIR $IROOT
 
 
-RUN mkdir -p $ULIB_DOCUMENT_ROOT 
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 
 
 WORKDIR $IROOT/ULib-$ULIB_VERSION
 WORKDIR $IROOT/ULib-$ULIB_VERSION
 
 
 # AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
 # AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
-RUN cp /src/* src/ulib/net/server/plugin/usp 
+RUN cp /src/* src/ulib/net/server/plugin/usp
 RUN find . -exec touch {} \;
 RUN find . -exec touch {} \;
 
 
 RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg
 RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg

+ 6 - 6
frameworks/C++/ulib/ulib-json_fit.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update -yqq && \
-	 apt install -yqq software-properties-common build-essential curl locales wget unzip git \
+RUN apt-get update -yqq && \
+	 apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
     re2c libnuma-dev \
     re2c libnuma-dev \
 	 postgresql-server-dev-all libcap2-bin && \
 	 postgresql-server-dev-all libcap2-bin && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 
@@ -38,14 +38,14 @@ ENV ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
 
 
 WORKDIR $IROOT
 WORKDIR $IROOT
 
 
-RUN mkdir -p $ULIB_DOCUMENT_ROOT 
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 
 
 WORKDIR $IROOT/ULib-$ULIB_VERSION
 WORKDIR $IROOT/ULib-$ULIB_VERSION
 
 
 # AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
 # AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
-RUN cp /src/* src/ulib/net/server/plugin/usp 
+RUN cp /src/* src/ulib/net/server/plugin/usp
 RUN find . -exec touch {} \;
 RUN find . -exec touch {} \;
 
 
 RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg
 RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg

+ 5 - 5
frameworks/C++/ulib/ulib-mongodb.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update -yqq && \
-	 apt install -yqq software-properties-common build-essential curl locales wget unzip git \
+RUN apt-get update -yqq && \
+	 apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
     re2c libnuma-dev \
     re2c libnuma-dev \
 	 postgresql-server-dev-all libcap2-bin && \
 	 postgresql-server-dev-all libcap2-bin && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 
@@ -44,7 +44,7 @@ RUN cd mongo-c-driver-1.4.0/ && \
     ./configure --prefix=${IROOT} --libdir=${IROOT} --disable-automatic-init-and-cleanup && \
     ./configure --prefix=${IROOT} --libdir=${IROOT} --disable-automatic-init-and-cleanup && \
     make && make install
     make && make install
 
 
-RUN mkdir -p $ULIB_DOCUMENT_ROOT 
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 
 

+ 5 - 5
frameworks/C++/ulib/ulib-mysql.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update -yqq && \
-	 apt install -yqq software-properties-common build-essential curl locales wget unzip git \
+RUN apt-get update -yqq && \
+	 apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
     re2c libnuma-dev \
     re2c libnuma-dev \
 	 postgresql-server-dev-all libcap2-bin && \
 	 postgresql-server-dev-all libcap2-bin && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 
@@ -38,7 +38,7 @@ ENV ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
 
 
 WORKDIR $IROOT
 WORKDIR $IROOT
 
 
-RUN mkdir -p $ULIB_DOCUMENT_ROOT 
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 
 

+ 6 - 6
frameworks/C++/ulib/ulib-plaintext_fit.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update -yqq && \
-	 apt install -yqq software-properties-common build-essential curl locales wget unzip git \
+RUN apt-get update -yqq && \
+	 apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
     re2c libnuma-dev \
     re2c libnuma-dev \
 	 postgresql-server-dev-all libcap2-bin && \
 	 postgresql-server-dev-all libcap2-bin && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 
@@ -38,14 +38,14 @@ ENV ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
 
 
 WORKDIR $IROOT
 WORKDIR $IROOT
 
 
-RUN mkdir -p $ULIB_DOCUMENT_ROOT 
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 
 
 WORKDIR $IROOT/ULib-$ULIB_VERSION
 WORKDIR $IROOT/ULib-$ULIB_VERSION
 
 
 # AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
 # AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
-RUN cp /src/* src/ulib/net/server/plugin/usp 
+RUN cp /src/* src/ulib/net/server/plugin/usp
 RUN find . -exec touch {} \;
 RUN find . -exec touch {} \;
 
 
 RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg
 RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg

+ 5 - 5
frameworks/C++/ulib/ulib-postgres.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update -yqq && \
-	 apt install -yqq software-properties-common build-essential curl locales wget unzip git \
+RUN apt-get update -yqq && \
+	 apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
     re2c libnuma-dev \
     re2c libnuma-dev \
 	 postgresql-server-dev-all libcap2-bin libldap-dev && \
 	 postgresql-server-dev-all libcap2-bin libldap-dev && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 
@@ -38,7 +38,7 @@ ENV ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
 
 
 WORKDIR $IROOT
 WORKDIR $IROOT
 
 
-RUN mkdir -p $ULIB_DOCUMENT_ROOT 
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 
 

+ 5 - 5
frameworks/C++/ulib/ulib-postgres_fit.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update -yqq && \
-	 apt install -yqq software-properties-common build-essential curl locales wget unzip git \
+RUN apt-get update -yqq && \
+	 apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
     re2c libnuma-dev \
     re2c libnuma-dev \
 	 postgresql-server-dev-all libcap2-bin libldap-dev && \
 	 postgresql-server-dev-all libcap2-bin libldap-dev && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 
@@ -38,7 +38,7 @@ ENV ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
 
 
 WORKDIR $IROOT
 WORKDIR $IROOT
 
 
-RUN mkdir -p $ULIB_DOCUMENT_ROOT 
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 
 

+ 6 - 6
frameworks/C++/ulib/ulib.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:18.04
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update -yqq && \
-	 apt install -yqq software-properties-common build-essential curl locales wget unzip git \
+RUN apt-get update -yqq && \
+	 apt-get install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -17,8 +17,8 @@ RUN apt update -yqq && \
     re2c libnuma-dev \
     re2c libnuma-dev \
 	 postgresql-server-dev-all libcap2-bin && \
 	 postgresql-server-dev-all libcap2-bin && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 	 add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-	 apt update -yqq && \
-	 apt install -yqq gcc-8 g++-8
+	 apt-get update -yqq && \
+	 apt-get install -yqq gcc-8 g++-8
 
 
 RUN locale-gen en_US.UTF-8
 RUN locale-gen en_US.UTF-8
 
 
@@ -38,14 +38,14 @@ ENV ULIB_DOCUMENT_ROOT=$ULIB_ROOT/ULIB_DOCUMENT_ROOT
 
 
 WORKDIR $IROOT
 WORKDIR $IROOT
 
 
-RUN mkdir -p $ULIB_DOCUMENT_ROOT 
+RUN mkdir -p $ULIB_DOCUMENT_ROOT
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN wget -q -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 RUN tar xf ULib-${ULIB_VERSION}.tar.gz
 
 
 WORKDIR $IROOT/ULib-$ULIB_VERSION
 WORKDIR $IROOT/ULib-$ULIB_VERSION
 
 
 # AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
 # AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
-RUN cp /src/* src/ulib/net/server/plugin/usp 
+RUN cp /src/* src/ulib/net/server/plugin/usp
 RUN find . -exec touch {} \;
 RUN find . -exec touch {} \;
 
 
 RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg
 RUN echo "userver {" >> $ULIB_ROOT/benchmark.cfg

+ 3 - 3
frameworks/C++/wt/wt-postgres.dockerfile

@@ -1,10 +1,10 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip cmake
 
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y
-RUN apt update -yqq
-RUN apt install -yqq gcc-6 g++-6
+RUN apt-get update -yqq
+RUN apt-get install -yqq gcc-6 g++-6
 
 
 ENV WT_VERSION 4.0.2
 ENV WT_VERSION 4.0.2
 ENV BOOST_ROOT /boost
 ENV BOOST_ROOT /boost

+ 3 - 3
frameworks/C++/wt/wt.dockerfile

@@ -1,10 +1,10 @@
 FROM buildpack-deps:xenial
 FROM buildpack-deps:xenial
 
 
-RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common unzip cmake
 
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y
-RUN apt update -yqq
-RUN apt install -yqq gcc-6 g++-6
+RUN apt-get update -yqq
+RUN apt-get install -yqq gcc-6 g++-6
 
 
 ENV WT_VERSION 4.0.2
 ENV WT_VERSION 4.0.2
 ENV BOOST_ROOT /boost
 ENV BOOST_ROOT /boost

+ 2 - 2
frameworks/C/h2o/h2o.dockerfile

@@ -3,8 +3,8 @@ FROM ubuntu:19.10
 WORKDIR /h2o_app_src
 WORKDIR /h2o_app_src
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update && \
-    apt install -yqq autoconf bison cmake curl file flex g++ git libnuma-dev libpq-dev libssl-dev \
+RUN apt-get update && \
+    apt-get install -yqq autoconf bison cmake curl file flex g++ git libnuma-dev libpq-dev libssl-dev \
                      libtool libyajl-dev libz-dev make wget
                      libtool libyajl-dev libz-dev make wget
 
 
 ### Install mustache-c
 ### Install mustache-c

+ 4 - 4
frameworks/C/libreactor/libreactor.dockerfile

@@ -1,11 +1,11 @@
 FROM ubuntu:16.04
 FROM ubuntu:16.04
 
 
-RUN apt update -yqq
-RUN apt install -yqq software-properties-common python-software-properties wget make
+RUN apt-get update -yqq
+RUN apt-get install -yqq software-properties-common python-software-properties wget make
 
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
-    apt update -yqq && \
-    apt install -yqq gcc-6 g++-6
+    apt-get update -yqq && \
+    apt-get install -yqq gcc-6 g++-6
 
 
 ADD ./ /libreactor
 ADD ./ /libreactor
 WORKDIR /libreactor
 WORKDIR /libreactor

+ 2 - 2
frameworks/C/lwan/lwan-lua.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:19.10
 FROM ubuntu:19.10
 
 
-RUN apt update -yqq && \
-	apt install -yqq \
+RUN apt-get update -yqq && \
+	apt-get install -yqq \
 		git pkg-config build-essential cmake zlib1g-dev \
 		git pkg-config build-essential cmake zlib1g-dev \
 		libsqlite3-dev libmariadbclient-dev wget
 		libsqlite3-dev libmariadbclient-dev wget
 
 

+ 2 - 2
frameworks/C/lwan/lwan.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:19.10
 FROM ubuntu:19.10
 
 
-RUN apt update -yqq && \
-	apt install -yqq \
+RUN apt-get update -yqq && \
+	apt-get install -yqq \
 		git pkg-config build-essential cmake zlib1g-dev \
 		git pkg-config build-essential cmake zlib1g-dev \
 		libsqlite3-dev libmariadbclient-dev wget
 		libsqlite3-dev libmariadbclient-dev wget
 
 

+ 2 - 2
frameworks/C/octane/octane.dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 FROM ubuntu:16.04
 
 
-RUN apt update -yqq && \
-    apt install -yqq software-properties-common build-essential git cmake automake libtool wget
+RUN apt-get update -yqq && \
+    apt-get install -yqq software-properties-common build-essential git cmake automake libtool wget
 
 
 WORKDIR /octane
 WORKDIR /octane
 RUN git clone https://github.com/simongui/octane.git .
 RUN git clone https://github.com/simongui/octane.git .

+ 1 - 1
frameworks/C/onion/onion.dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:16.04
 ADD ./ /onion
 ADD ./ /onion
 WORKDIR /onion
 WORKDIR /onion
 
 
-RUN apt update -yqq && apt install -yqq git cmake make libmysqlclient-dev libjson0-dev libgnutls-dev libgcrypt-dev
+RUN apt-get update -yqq && apt-get install -yqq git cmake make libmysqlclient-dev libjson0-dev libgnutls-dev libgcrypt-dev
 
 
 ENV ONION_LOG noinfo
 ENV ONION_LOG noinfo
 
 

+ 1 - 1
frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx-jn.dockerfile

@@ -1,5 +1,5 @@
 FROM mono:latest
 FROM mono:latest
-RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+RUN apt-get update -yqq && apt-get install -yqq nginx wget mono-fastcgi-server
 
 
 WORKDIR /aspnet
 WORKDIR /aspnet
 COPY src src
 COPY src src

+ 1 - 1
frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx-my-ef.dockerfile

@@ -1,5 +1,5 @@
 FROM mono:latest
 FROM mono:latest
-RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+RUN apt-get update -yqq && apt-get install -yqq nginx wget mono-fastcgi-server
 
 
 WORKDIR /aspnet
 WORKDIR /aspnet
 COPY src src
 COPY src src

+ 1 - 1
frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx-my.dockerfile

@@ -1,5 +1,5 @@
 FROM mono:latest
 FROM mono:latest
-RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+RUN apt-get update -yqq && apt-get install -yqq nginx wget mono-fastcgi-server
 
 
 WORKDIR /aspnet
 WORKDIR /aspnet
 COPY src src
 COPY src src

+ 1 - 1
frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx-ss.dockerfile

@@ -1,5 +1,5 @@
 FROM mono:latest
 FROM mono:latest
-RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+RUN apt-get update -yqq && apt-get install -yqq nginx wget mono-fastcgi-server
 
 
 WORKDIR /aspnet
 WORKDIR /aspnet
 COPY src src
 COPY src src

+ 1 - 1
frameworks/CSharp/aspnet-mono-ngx/aspnet-mono-ngx.dockerfile

@@ -1,5 +1,5 @@
 FROM mono:latest
 FROM mono:latest
-RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+RUN apt-get update -yqq && apt-get install -yqq nginx wget mono-fastcgi-server
 
 
 WORKDIR /aspnet
 WORKDIR /aspnet
 COPY src src
 COPY src src

+ 1 - 1
frameworks/CSharp/evhttp-sharp/evhttp-sharp.dockerfile

@@ -1,5 +1,5 @@
 FROM mono:5.10.0.160
 FROM mono:5.10.0.160
-RUN apt update -yqq && apt install -yqq libevent-dev
+RUN apt-get update -yqq && apt-get install -yqq libevent-dev
 
 
 WORKDIR /evhttp
 WORKDIR /evhttp
 COPY src src
 COPY src src

+ 1 - 1
frameworks/CSharp/revenj/revenj.dockerfile

@@ -1,5 +1,5 @@
 FROM mono:5.12.0.226
 FROM mono:5.12.0.226
-RUN apt update -yqq && apt install -yqq unzip
+RUN apt-get update -yqq && apt-get install -yqq unzip
 
 
 RUN mkdir /java
 RUN mkdir /java
 WORKDIR /java
 WORKDIR /java

+ 1 - 1
frameworks/CSharp/servicestack/README.md

@@ -44,7 +44,7 @@
 
 
 ## Mono Installation
 ## Mono Installation
 
 
-    sudo apt install build-essential autoconf automake libtool zlib1g-dev git
+    sudo apt-get install build-essential autoconf automake libtool zlib1g-dev git
 
 
     git clone git://github.com/mono/mono
     git clone git://github.com/mono/mono
     cd mono
     cd mono

+ 1 - 1
frameworks/CSharp/servicestack/servicestack.dockerfile

@@ -1,5 +1,5 @@
 FROM mono:5.8.0.127
 FROM mono:5.8.0.127
-RUN apt update -yqq && apt install -yqq nginx wget mono-fastcgi-server
+RUN apt-get update -yqq && apt-get install -yqq nginx wget mono-fastcgi-server
 
 
 WORKDIR /servicestack
 WORKDIR /servicestack
 COPY src src
 COPY src src

+ 1 - 1
frameworks/Clojure/macchiato/macchiato.dockerfile

@@ -5,6 +5,6 @@ COPY src src
 COPY project.clj project.clj
 COPY project.clj project.clj
 ENV NODE_ENV=production
 ENV NODE_ENV=production
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-RUN apt install -yqq nodejs
+RUN apt-get install -yqq nodejs
 RUN lein package
 RUN lein package
 CMD ["node", "target/release/hello.js"]
 CMD ["node", "target/release/hello.js"]

+ 1 - 1
frameworks/Crystal/amber/amber.dockerfile

@@ -11,7 +11,7 @@ ENV GC_MARKERS 1
 ENV AMBER_ENV production
 ENV AMBER_ENV production
 ENV DATABASE_URL postgres://benchmarkdbuser:benchmarkdbpass@tfb-database:5432/hello_world?initial_pool_size=56&max_pool_size=56&max_idle_pool_size=56
 ENV DATABASE_URL postgres://benchmarkdbuser:benchmarkdbpass@tfb-database:5432/hello_world?initial_pool_size=56&max_pool_size=56&max_idle_pool_size=56
 
 
-RUN apt install -yqq libyaml-dev
+RUN apt-get install -yqq libyaml-dev
 RUN shards build amber --release --no-debug
 RUN shards build amber --release --no-debug
 
 
 CMD bash run.sh
 CMD bash run.sh

+ 2 - 2
frameworks/Crystal/h2o.cr/h2o.cr.dockerfile

@@ -1,7 +1,7 @@
 FROM debian:sid
 FROM debian:sid
 
 
-RUN apt update \
-  && apt install -yqq libh2o-evloop-dev libwslay-dev libyaml-0-2 libevent-dev libpcre3-dev \
+RUN apt-get update \
+  && apt-get install -yqq libh2o-evloop-dev libwslay-dev libyaml-0-2 libevent-dev libpcre3-dev \
     gcc wget git libssl-dev libuv1-dev ca-certificates --no-install-recommends
     gcc wget git libssl-dev libuv1-dev ca-certificates --no-install-recommends
 
 
 RUN wget -q https://github.com/crystal-lang/crystal/releases/download/0.26.1/crystal-0.26.1-1-linux-x86_64.tar.gz \
 RUN wget -q https://github.com/crystal-lang/crystal/releases/download/0.26.1/crystal-0.26.1-1-linux-x86_64.tar.gz \

+ 1 - 1
frameworks/D/hunt/hunt-dmd.dockerfile

@@ -3,7 +3,7 @@ FROM dlangchina/dlang-dmd:latest
 ADD ./ /hunt
 ADD ./ /hunt
 WORKDIR /hunt
 WORKDIR /hunt
 
 
-RUN apt update -y && apt install -y --no-install-recommends git && apt install -yqq libpq-dev libsqlite3-dev default-libmysqlclient-dev zlib1g-dev && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/*
+RUN apt-get update -y && apt-get install -y --no-install-recommends git && apt-get install -yqq libpq-dev libsqlite3-dev default-libmysqlclient-dev zlib1g-dev && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/*
 
 
 RUN git clone https://github.com/h2o/picohttpparser.git && \
 RUN git clone https://github.com/h2o/picohttpparser.git && \
     cp -rf patches/Makefile picohttpparser && \
     cp -rf patches/Makefile picohttpparser && \

+ 1 - 1
frameworks/D/hunt/hunt-http.dockerfile

@@ -3,7 +3,7 @@ FROM dlangchina/dlang-ldc:latest
 ADD ./ /hunt
 ADD ./ /hunt
 WORKDIR /hunt
 WORKDIR /hunt
 
 
-RUN apt update -y && apt install -y --no-install-recommends git && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/*
+RUN apt-get update -y && apt-get install -y --no-install-recommends git && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/*
 
 
 RUN git clone https://github.com/nodejs/http-parser.git && \
 RUN git clone https://github.com/nodejs/http-parser.git && \
     cd http-parser && \
     cd http-parser && \

+ 1 - 1
frameworks/D/hunt/hunt.dockerfile

@@ -3,7 +3,7 @@ FROM dlangchina/dlang-ldc:latest
 ADD ./ /hunt
 ADD ./ /hunt
 WORKDIR /hunt
 WORKDIR /hunt
 
 
-RUN apt update -y && apt install -y --no-install-recommends git && apt install -yqq libpq-dev libsqlite3-dev default-libmysqlclient-dev zlib1g-dev  && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/*
+RUN apt-get update -y && apt-get install -y --no-install-recommends git && apt-get install -yqq libpq-dev libsqlite3-dev default-libmysqlclient-dev zlib1g-dev  && rm -rf /var/lib/apt/lists/* && rm -rf /var/cache/apt/*
 
 
 RUN git clone https://github.com/h2o/picohttpparser.git && \
 RUN git clone https://github.com/h2o/picohttpparser.git && \
     cp -rf patches/Makefile picohttpparser && \
     cp -rf patches/Makefile picohttpparser && \

+ 1 - 1
frameworks/D/vibed/vibed-dmd-pgsql.dockerfile

@@ -3,7 +3,7 @@ FROM dlang2/dmd-ubuntu:2.085.1
 WORKDIR /dlang/app
 WORKDIR /dlang/app
 COPY . .
 COPY . .
 
 
-RUN apt update -yqq && apt install -yqq libpq-dev zlib1g-dev
+RUN apt-get update -yqq && apt-get install -yqq libpq-dev zlib1g-dev
 
 
 RUN dub build -b release --config=postgresql
 RUN dub build -b release --config=postgresql
 
 

+ 1 - 1
frameworks/D/vibed/vibed-ldc-pgsql.dockerfile

@@ -3,7 +3,7 @@ FROM dlang2/ldc-ubuntu:1.15.0
 WORKDIR /dlang/app
 WORKDIR /dlang/app
 COPY . .
 COPY . .
 
 
-RUN apt update -yqq && apt install -yqq libpq-dev zlib1g-dev
+RUN apt-get update -yqq && apt-get install -yqq libpq-dev zlib1g-dev
 
 
 RUN dub build -b release --compiler=ldc2 --config=postgresql
 RUN dub build -b release --compiler=ldc2 --config=postgresql
 
 

+ 1 - 1
frameworks/D/vibed/vibed-ldc.dockerfile

@@ -3,7 +3,7 @@ FROM dlang2/ldc-ubuntu:1.15.0
 WORKDIR /dlang/app
 WORKDIR /dlang/app
 COPY . .
 COPY . .
 
 
-RUN apt update -yqq && apt install -yqq zlib1g-dev
+RUN apt-get update -yqq && apt-get install -yqq zlib1g-dev
 
 
 RUN dub build -b release --compiler=ldc2 --verbose
 RUN dub build -b release --compiler=ldc2 --verbose
 
 

+ 1 - 1
frameworks/D/vibed/vibed.dockerfile

@@ -3,7 +3,7 @@ FROM dlang2/dmd-ubuntu:2.085.1
 WORKDIR /dlang/app
 WORKDIR /dlang/app
 COPY . .
 COPY . .
 
 
-RUN apt update -yqq && apt install -yqq libpq-dev zlib1g-dev
+RUN apt-get update -yqq && apt-get install -yqq libpq-dev zlib1g-dev
 
 
 RUN dub build -b release --verbose
 RUN dub build -b release --verbose
 
 

+ 1 - 1
frameworks/Dart/start/start.dockerfile

@@ -1,6 +1,6 @@
 FROM google/dart:1.24
 FROM google/dart:1.24
 
 
-RUN apt update -yqq && apt install -yqq nginx
+RUN apt-get update -yqq && apt-get install -yqq nginx
 
 
 ADD ./ /start
 ADD ./ /start
 WORKDIR /start
 WORKDIR /start

+ 1 - 1
frameworks/Dart/stream/stream.dockerfile

@@ -1,6 +1,6 @@
 FROM google/dart:1.24
 FROM google/dart:1.24
 
 
-RUN apt update -yqq && apt install -yqq nginx
+RUN apt-get update -yqq && apt-get install -yqq nginx
 
 
 ADD ./ /stream
 ADD ./ /stream
 WORKDIR /stream
 WORKDIR /stream

+ 5 - 5
frameworks/Elixir/plug/elixir-plug-ecto.dockerfile

@@ -1,7 +1,7 @@
 FROM elixir:1.9.4 as builder
 FROM elixir:1.9.4 as builder
 
 
-RUN apt update -y && \
-  apt install -y libicu-dev
+RUN apt-get update -y && \
+  apt-get install -y libicu-dev
 
 
 ENV MIX_ENV=prod \
 ENV MIX_ENV=prod \
   LANG=C.UTF-8
   LANG=C.UTF-8
@@ -22,8 +22,8 @@ RUN mix release
 
 
 FROM debian:buster-slim AS app
 FROM debian:buster-slim AS app
 
 
-RUN apt update -y && \
-  apt install -y openssl libicu-dev
+RUN apt-get update -y && \
+  apt-get install -y openssl libicu-dev
 
 
 ENV LANG=C.UTF-8
 ENV LANG=C.UTF-8
 
 
@@ -34,4 +34,4 @@ WORKDIR /home/app
 COPY --from=builder /app/_build .
 COPY --from=builder /app/_build .
 
 
 # Run the Phoenix app
 # Run the Phoenix app
-CMD ["./prod/rel/framework_benchmarks/bin/framework_benchmarks", "start"]
+CMD ["./prod/rel/framework_benchmarks/bin/framework_benchmarks", "start"]

+ 2 - 1
frameworks/Erlang/chicagoboss/benchmark_config.json

@@ -18,6 +18,7 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "ChicagoBoss",
       "display_name": "ChicagoBoss",
       "notes": "",
       "notes": "",
-      "versus": ""
+      "versus": "",
+      "tags": ["broken"]
   }}]
   }}]
 }
 }

+ 2 - 2
frameworks/Haskell/servant/servant-beam.dockerfile

@@ -1,7 +1,7 @@
 FROM haskell:8.6.5
 FROM haskell:8.6.5
 
 
-RUN apt update -yqq && apt install -yqq xz-utils make
-RUN apt install -yqq libpq-dev
+RUN apt-get update -yqq && apt-get install -yqq xz-utils make
+RUN apt-get install -yqq libpq-dev
 
 
 WORKDIR /app
 WORKDIR /app
 
 

+ 2 - 2
frameworks/Haskell/servant/servant-psql-simple.dockerfile

@@ -1,7 +1,7 @@
 FROM haskell:8.6.5
 FROM haskell:8.6.5
 
 
-RUN apt update -yqq && apt install -yqq xz-utils make
-RUN apt install -yqq libpq-dev
+RUN apt-get update -yqq && apt-get install -yqq xz-utils make
+RUN apt-get install -yqq libpq-dev
 
 
 WORKDIR /app
 WORKDIR /app
 
 

+ 2 - 2
frameworks/Haskell/servant/servant.dockerfile

@@ -1,7 +1,7 @@
 FROM haskell:8.6.5
 FROM haskell:8.6.5
 
 
-RUN apt update -yqq && apt install -yqq xz-utils make
-RUN apt install -yqq libpq-dev
+RUN apt-get update -yqq && apt-get install -yqq xz-utils make
+RUN apt-get install -yqq libpq-dev
 
 
 WORKDIR /app
 WORKDIR /app
 
 

+ 2 - 2
frameworks/Haskell/snap/snap.dockerfile

@@ -1,7 +1,7 @@
 FROM haskell:8.6.3
 FROM haskell:8.6.3
 
 
-RUN apt update -yqq && apt install -yqq xz-utils make netbase
-RUN apt install -yqq default-libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
+RUN apt-get update -yqq && apt-get install -yqq xz-utils make netbase
+RUN apt-get install -yqq default-libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
 
 
 COPY ./bench /snap
 COPY ./bench /snap
 WORKDIR /snap
 WORKDIR /snap

+ 2 - 2
frameworks/Haskell/spock/spock.dockerfile

@@ -1,7 +1,7 @@
 FROM haskell:8.6.3
 FROM haskell:8.6.3
 
 
-RUN apt update -yqq && apt install -yqq xz-utils make
-RUN apt install -yqq libpq-dev
+RUN apt-get update -yqq && apt-get install -yqq xz-utils make
+RUN apt-get install -yqq libpq-dev
 
 
 ADD ./ /spock
 ADD ./ /spock
 WORKDIR spock
 WORKDIR spock

+ 2 - 2
frameworks/Haskell/warp/warp-shared.dockerfile

@@ -1,7 +1,7 @@
 FROM haskell:8.6.3
 FROM haskell:8.6.3
 
 
-RUN apt update -yqq && apt install -yqq xz-utils make
-RUN apt install -yqq libpq-dev
+RUN apt-get update -yqq && apt-get install -yqq xz-utils make
+RUN apt-get install -yqq libpq-dev
 
 
 WORKDIR /app
 WORKDIR /app
 
 

+ 4 - 2
frameworks/Haskell/yesod/benchmark_config.json

@@ -22,7 +22,8 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "yesod-mysql",
       "display_name": "yesod-mysql",
       "notes": "",
       "notes": "",
-      "versus": "wai"
+      "versus": "wai",
+      "tags": ["broken"]
     },
     },
     "mongodb-raw": {
     "mongodb-raw": {
       "db_url": "/mongo/raw/db",
       "db_url": "/mongo/raw/db",
@@ -41,7 +42,8 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "yesod-mongo",
       "display_name": "yesod-mongo",
       "notes": "",
       "notes": "",
-      "versus": "wai"
+      "versus": "wai",
+      "tags": ["broken"]
     }
     }
   }]
   }]
 }
 }

+ 2 - 2
frameworks/Haskell/yesod/yesod-mongodb-raw.dockerfile

@@ -1,7 +1,7 @@
 FROM haskell:7.10.3
 FROM haskell:7.10.3
 
 
-RUN apt update -yqq && apt install -yqq xz-utils make netbase
-RUN apt install -yqq libpq-dev libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
+RUN apt-get update -yqq && apt-get install -yqq xz-utils make netbase
+RUN apt-get install -yqq libpq-dev libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
 
 
 COPY ./yesod-mysql-mongo ./
 COPY ./yesod-mysql-mongo ./
 
 

+ 2 - 2
frameworks/Haskell/yesod/yesod.dockerfile

@@ -1,7 +1,7 @@
 FROM haskell:7.10.3
 FROM haskell:7.10.3
 
 
-RUN apt update -yqq && apt install -yqq xz-utils make netbase
-RUN apt install -yqq libpq-dev libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
+RUN apt-get update -yqq && apt-get install -yqq xz-utils make netbase
+RUN apt-get install -yqq libpq-dev libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
 
 
 COPY ./yesod-mysql-mongo ./
 COPY ./yesod-mysql-mongo ./
 
 

+ 1 - 1
frameworks/Java/play1/play1.dockerfile

@@ -6,5 +6,5 @@ COPY public public
 COPY test test
 COPY test test
 RUN wget -nv https://downloads.typesafe.com/play/1.5.2/play-1.5.2.zip
 RUN wget -nv https://downloads.typesafe.com/play/1.5.2/play-1.5.2.zip
 RUN unzip -q play-1.5.2.zip
 RUN unzip -q play-1.5.2.zip
-RUN apt install -yqq python
+RUN apt-get install -yqq python
 CMD ["play-1.5.2/play", "run", "--%prod"]
 CMD ["play-1.5.2/play", "run", "--%prod"]

+ 3 - 3
frameworks/Java/revenj-jvm/revenj-jvm.dockerfile

@@ -4,11 +4,11 @@ COPY src src
 COPY pom.xml pom.xml
 COPY pom.xml pom.xml
 
 
 # no GPG by default in the base image
 # no GPG by default in the base image
-RUN apt update -qqy && apt install -yqq gnupg unzip wget > /dev/null
+RUN apt-get update -qqy && apt-get install -yqq gnupg unzip wget > /dev/null
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
 RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
-RUN apt update
-RUN apt install -yqq mono-complete mono-fastcgi-server
+RUN apt-get update
+RUN apt-get install -yqq mono-complete mono-fastcgi-server
 
 
 RUN wget -q https://github.com/ngs-doo/revenj/releases/download/1.4.2/dsl-compiler.zip
 RUN wget -q https://github.com/ngs-doo/revenj/releases/download/1.4.2/dsl-compiler.zip
 RUN unzip -o dsl-compiler.zip
 RUN unzip -o dsl-compiler.zip

+ 2 - 2
frameworks/JavaScript/hapi/hapi-nginx.dockerfile

@@ -1,7 +1,7 @@
 FROM node:12.3.1-slim
 FROM node:12.3.1-slim
 
 
-RUN apt update
-RUN apt install nginx -y
+RUN apt-get update
+RUN apt-get install nginx -y
 
 
 WORKDIR /
 WORKDIR /
 
 

+ 1 - 1
frameworks/Lua/lapis/lapis.dockerfile

@@ -3,7 +3,7 @@ FROM buildpack-deps:xenial
 ENV LUA_VERSION="5.1"
 ENV LUA_VERSION="5.1"
 ENV LUA_MICRO="5"
 ENV LUA_MICRO="5"
 
 
-RUN apt update -yqq && apt install -yqq unzip
+RUN apt-get update -yqq && apt-get install -yqq unzip
 
 
 RUN wget https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
 RUN wget https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
 RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz
 RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz

+ 2 - 1
frameworks/Lua/octopus/benchmark_config.json

@@ -21,7 +21,8 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "Octopus",
       "display_name": "Octopus",
       "notes": "",
       "notes": "",
-      "versus": "openresty"
+      "versus": "openresty",
+      "tags": ["broken"]
     }
     }
   }]
   }]
 }
 }

+ 1 - 1
frameworks/Lua/octopus/octopus.dockerfile

@@ -3,7 +3,7 @@ FROM buildpack-deps:xenial
 ENV LUA_VERSION="5.1"
 ENV LUA_VERSION="5.1"
 ENV LUA_MICRO="5"
 ENV LUA_MICRO="5"
 
 
-RUN apt update -yqq && apt install -yqq unzip
+RUN apt-get update -yqq && apt-get install -yqq unzip
 
 
 RUN wget https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
 RUN wget https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
 RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz
 RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz

+ 1 - 1
frameworks/Lua/openresty/openresty.dockerfile

@@ -3,7 +3,7 @@ FROM buildpack-deps:xenial
 ENV LUA_VERSION="5.1"
 ENV LUA_VERSION="5.1"
 ENV LUA_MICRO="5"
 ENV LUA_MICRO="5"
 
 
-RUN apt update -yqq && apt install -yqq unzip
+RUN apt-get update -yqq && apt-get install -yqq unzip
 
 
 RUN wget https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
 RUN wget https://github.com/LuaDist/lua/archive/$LUA_VERSION.$LUA_MICRO.tar.gz
 RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz
 RUN tar xf $LUA_VERSION.$LUA_MICRO.tar.gz

+ 2 - 1
frameworks/PHP/peachpie/benchmark_config.json

@@ -22,7 +22,8 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "peachpie",
       "display_name": "peachpie",
       "notes": "",
       "notes": "",
-      "versus": "php"
+      "versus": "php",
+      "tags": ["broken"]
     }
     }
   }]
   }]
 }
 }

+ 2 - 2
frameworks/PHP/php/php-h2o.dockerfile

@@ -2,8 +2,8 @@ FROM ubuntu:19.10
 
 
 COPY ./ ./
 COPY ./ ./
 
 
-RUN apt update > /dev/null && \
-    apt install -yqq autoconf bison cmake curl file flex g++ git libnuma-dev libpq-dev libssl-dev \
+RUN apt-get update > /dev/null && \
+    apt-get install -yqq autoconf bison cmake curl file flex g++ git libnuma-dev libpq-dev libssl-dev \
                      libtool libyajl-dev libz-dev make wget software-properties-common > /dev/null
                      libtool libyajl-dev libz-dev make wget software-properties-common > /dev/null
 
 
 ### Install php
 ### Install php

+ 2 - 2
frameworks/PHP/php/php-pgsql-raw.dockerfile

@@ -2,10 +2,10 @@ FROM ubuntu:19.10
 
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG DEBIAN_FRONTEND=noninteractive
 
 
-RUN apt update -yqq && apt-get install -yqq software-properties-common > /dev/null
+RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-get update -yqq > /dev/null && \
 RUN apt-get update -yqq > /dev/null && \
-    apt install -yqq nginx git unzip php7.4 php7.4-common php7.4-cli php7.4-fpm php7.4-pgsql  > /dev/null
+    apt-get install -yqq nginx git unzip php7.4 php7.4-common php7.4-cli php7.4-fpm php7.4-pgsql  > /dev/null
 
 
 COPY deploy/conf/* /etc/php/7.4/fpm/
 COPY deploy/conf/* /etc/php/7.4/fpm/
 
 

+ 3 - 2
frameworks/Perl/dancer/benchmark_config.json

@@ -18,7 +18,8 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "dancer",
       "display_name": "dancer",
       "notes": "",
       "notes": "",
-      "versus": ""
+      "versus": "",
+      "tags": ["broken"]
     }
     }
   }]
   }]
-}
+}

+ 1 - 1
frameworks/Perl/dancer/dancer.dockerfile

@@ -1,6 +1,6 @@
 FROM perl:5.26
 FROM perl:5.26
 
 
-RUN apt update -yqq && apt install -yqq nginx
+RUN apt-get update -yqq && apt-get install -yqq nginx
 
 
 ADD ./ /dancer
 ADD ./ /dancer
 WORKDIR /dancer
 WORKDIR /dancer

+ 4 - 2
frameworks/Perl/kelp/benchmark_config.json

@@ -19,7 +19,8 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "kelp",
       "display_name": "kelp",
       "notes": "",
       "notes": "",
-      "versus": ""
+      "versus": "",
+      "tags": ["broken"]
     },
     },
     "mongodb": {
     "mongodb": {
       "db_url": "/db/mongo",
       "db_url": "/db/mongo",
@@ -39,7 +40,8 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "kelp",
       "display_name": "kelp",
       "notes": "",
       "notes": "",
-      "versus": ""
+      "versus": "",
+      "tags": ["broken"]
     }
     }
   }]
   }]
 }
 }

+ 1 - 1
frameworks/Perl/kelp/kelp-mongodb.dockerfile

@@ -1,6 +1,6 @@
 FROM perl:5.26
 FROM perl:5.26
 
 
-RUN apt update -yqq && apt install -yqq nginx
+RUN apt-get update -yqq && apt-get install -yqq nginx
 
 
 WORKDIR /kelp
 WORKDIR /kelp
 
 

+ 1 - 1
frameworks/Perl/kelp/kelp.dockerfile

@@ -1,6 +1,6 @@
 FROM perl:5.26
 FROM perl:5.26
 
 
-RUN apt update -yqq && apt install -yqq nginx
+RUN apt-get update -yqq && apt-get install -yqq nginx
 
 
 WORKDIR /kelp
 WORKDIR /kelp
 
 

+ 1 - 1
frameworks/Perl/plack/plack-async.dockerfile

@@ -1,6 +1,6 @@
 FROM perl:latest
 FROM perl:latest
 
 
-RUN apt update -yqq && apt install -yqq nginx
+RUN apt-get update -yqq && apt-get install -yqq nginx
 RUN cpanm --notest --no-man-page Plack JSON::XS Unix::Processors DBI DBD::mysql
 RUN cpanm --notest --no-man-page Plack JSON::XS Unix::Processors DBI DBD::mysql
 RUN cpanm --notest --no-man-page Cookie::Baker::XS Twiggy::Prefork HTTP::Parser::XS EV AnyEvent::DBI
 RUN cpanm --notest --no-man-page Cookie::Baker::XS Twiggy::Prefork HTTP::Parser::XS EV AnyEvent::DBI
 
 

+ 2 - 2
frameworks/Perl/plack/plack.dockerfile

@@ -1,6 +1,6 @@
 FROM perl:latest
 FROM perl:latest
 
 
-RUN apt update -yqq && apt install -yqq nginx
+RUN apt-get update -yqq && apt-get install -yqq nginx
 RUN cpanm --notest --no-man-page Plack JSON::XS Unix::Processors DBI DBD::mysql
 RUN cpanm --notest --no-man-page Plack JSON::XS Unix::Processors DBI DBD::mysql
 RUN cpanm --notest --no-man-page Gazelle Cookie::Baker::XS
 RUN cpanm --notest --no-man-page Gazelle Cookie::Baker::XS
 
 
@@ -8,4 +8,4 @@ ADD nginx.conf ./
 ADD app.pl ./
 ADD app.pl ./
 ADD app.psgi ./
 ADD app.psgi ./
 
 
-CMD perl app.pl
+CMD perl app.pl

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно