From 88f46fbe909cf4e97e198ee9fc2bfea9cc5f62a5 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Thu, 26 Nov 2015 14:08:28 +0100 Subject: [PATCH] Better run.sh for Docker image --- Dockerfile | 6 +++--- packaging/docker/run.sh | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f9309ef6..79530623 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,13 +4,13 @@ EXPOSE 5222 VOLUME ["/etc/spectrum2/transports", "/var/lib/spectrum2"] RUN dnf install protobuf protobuf swiften gcc gcc-c++ make libpqxx-devel libpurple-devel protobuf-devel swiften-devel rpm-build avahi-devel boost-devel cmake cppunit-devel expat-devel libcommuni-devel libidn-devel libsqlite3x-devel log4cxx-devel mysql-devel popt-devel git libevent-devel qt-devel dbus-glib-devel libcurl-devel -y && \ - git clone git://github.com/hanzz/libtransport.git && \ - cd libtransport && \ + git clone git://github.com/hanzz/spectrum2.git && \ + cd spectrum2 && \ ./packaging/fedora/build_rpm.sh && \ rpm -U /root/rpmbuild/RPMS/x86_64/*.rpm && \ cp ./packaging/docker/run.sh /run.sh && \ cd .. && \ - rm -rf libtransport && \ + rm -rf spectrum2 && \ rm -rf ~/rpmbuild && \ rm -rf /usr/share/locale/* && \ rm -rf /usr/share/doc/* && \ diff --git a/packaging/docker/run.sh b/packaging/docker/run.sh index c0d6967b..17198c3a 100755 --- a/packaging/docker/run.sh +++ b/packaging/docker/run.sh @@ -1,9 +1,11 @@ #!/bin/bash -spectrum2_manager start - while : do + echo "Trying to start Spectrum 2 instances." + echo "You should mount the directory with configuration files to /etc/spectrum2/transports/." + echo "Check the http://spectrum.im/documentation for more information." + spectrum2_manager start + tail -f /var/log/spectrum2/*/* 2>/dev/null sleep 2 - tail -f /var/log/spectrum2/*/* /var/log/spectrum2/*/*/* done