Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tomcat build

Browse Source
This commit is contained in:
Disassembler 2018-09-12 14:19:36 +02:00
parent b02d70df38
commit 939d9b0d45
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basic-runtimes/ruby.lxcfile
View File

@ -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

2
basic-runtimes/tomcat.lxcfile
View File

@ -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

8
build-all.sh
View File

@ -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

6
pandora/Dockerfile
View File

@ -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 \

2
setup-all.sh
View File

@ -11,4 +11,4 @@ ${SOURCE_DIR}/redis/setup.sh
${SOURCE_DIR}/solr/setup.sh
# Setup applications
${SOURCE_DIR}/ckan
${SOURCE_DIR}/ckan/setup.sh