From 939d9b0d458e0d2efa67439dff2fe164858498ce Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Wed, 12 Sep 2018 14:19:36 +0200
Subject: [PATCH] Fix tomcat build

---
 basic-runtimes/ruby.lxcfile   | 2 +-
 basic-runtimes/tomcat.lxcfile | 2 +-
 build-all.sh                  | 8 ++++----
 pandora/Dockerfile            | 6 +++---
 setup-all.sh                  | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/basic-runtimes/ruby.lxcfile b/basic-runtimes/ruby.lxcfile
index 27a9e6a..1a2243c 100644
--- a/basic-runtimes/ruby.lxcfile
+++ b/basic-runtimes/ruby.lxcfile
@@ -22,7 +22,7 @@ SCRIPT
     ac_cv_func_isnan=yes ac_cv_func_isinf=yes ./configure --build=x86_64-linux-musl --disable-install-doc --enable-shared
 
     # Compile and install Ruby
-    make -j $(nproc)
+    make -j $(getconf _NPROCESSORS_ONLN)
     make install
 
     # Install RubyGems and Bundler
diff --git a/basic-runtimes/tomcat.lxcfile b/basic-runtimes/tomcat.lxcfile
index cb0e944..c37d981 100644
--- a/basic-runtimes/tomcat.lxcfile
+++ b/basic-runtimes/tomcat.lxcfile
@@ -5,7 +5,7 @@ LAYER shared/tomcat
 
 SCRIPT
     # Install Tomcat 8
-    wget http://mirror.hosting90.cz/apache/tomcat/tomcat-8/v8.0.53/bin/apache-tomcat-8.0.53.tar.gz | tar xzf - -C /srv
+    wget http://mirror.hosting90.cz/apache/tomcat/tomcat-8/v8.0.53/bin/apache-tomcat-8.0.53.tar.gz -O - | tar xzf - -C /srv
     mv /srv/apache-tomcat-8.0.53 /srv/tomcat
 
     # Make catalina.sh available globally
diff --git a/build-all.sh b/build-all.sh
index 788a04b..fa1cfa7 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -16,12 +16,12 @@ lxc-build ${SOURCE_DIR}/basic-runtimes/alpine.lxcfile
 # Build shared overlays
 lxc-build ${SOURCE_DIR}/basic-runtimes/java.lxcfile
 lxc-build ${SOURCE_DIR}/basic-runtimes/libxml.lxcfile
-#lxc-build ${SOURCE_DIR}/basic-runtimes/php.lxcfile
+lxc-build ${SOURCE_DIR}/basic-runtimes/php.lxcfile
 lxc-build ${SOURCE_DIR}/basic-runtimes/python2.lxcfile
 lxc-build ${SOURCE_DIR}/basic-runtimes/python3.lxcfile
-#lxc-build ${SOURCE_DIR}/basic-runtimes/nodejs.lxcfile
-#lxc-build ${SOURCE_DIR}/basic-runtimes/ruby.lxcfile
-#lxc-build ${SOURCE_DIR}/basic-runtimes/tomcat.lxcfile
+lxc-build ${SOURCE_DIR}/basic-runtimes/nodejs.lxcfile
+lxc-build ${SOURCE_DIR}/basic-runtimes/ruby.lxcfile
+lxc-build ${SOURCE_DIR}/basic-runtimes/tomcat.lxcfile
 
 # Build applications
 lxc-build ${SOURCE_DIR}/activemq
diff --git a/pandora/Dockerfile b/pandora/Dockerfile
index 1b10c30..956322e 100644
--- a/pandora/Dockerfile
+++ b/pandora/Dockerfile
@@ -14,21 +14,21 @@ RUN \
  && tar xf /tmp/liboggz.tgz -C /tmp \
  && cd /tmp/liboggz-1.1.1 \
  && ./configure \
- && make -j $(nproc) \
+ && make -j $(getconf _NPROCESSORS_ONLN) \
  && make install \
  # Compile libfishsound
  && wget https://ftp.osuosl.org/pub/xiph/releases/libfishsound/libfishsound-1.0.0.tar.gz -O /tmp/libfishsound.tgz \
  && tar xf /tmp/libfishsound.tgz -C /tmp/ \
  && cd /tmp/libfishsound-1.0.0 \
  && ./configure \
- && make -j $(nproc) \
+ && make -j $(getconf _NPROCESSORS_ONLN) \
  && make install \
  # Compile liboggplay
  && git clone --depth 1 git://git.xiph.org/liboggplay.git /tmp/liboggplay \
  && cd /tmp/liboggplay \
  && ./autogen.sh \
  && ./configure \
- && make -j $(nproc) \
+ && make -j $(getconf _NPROCESSORS_ONLN) \
  && make install \
  # Compile Oxframe
  && git clone --depth 1 https://code.0x2620.org/0x2620/oxframe /tmp/oxframe \
diff --git a/setup-all.sh b/setup-all.sh
index 6a064c6..057f808 100755
--- a/setup-all.sh
+++ b/setup-all.sh
@@ -11,4 +11,4 @@ ${SOURCE_DIR}/redis/setup.sh
 ${SOURCE_DIR}/solr/setup.sh
 
 # Setup applications
-${SOURCE_DIR}/ckan
+${SOURCE_DIR}/ckan/setup.sh