libtransport.git Changeset - affd19661280

Changeset - affd19661280

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Florian Kinder - 7 years ago 2018-12-01 11:39:09
florian.kinder@fankserver.com

WIP smaller alpine image

3 files changed with 11 insertions and 6 deletions:

.gitignore

CMakeLists.txt

Dockerfile-alpine

0 comments (0 inline, 0 general)

.gitignore

➞

Show inline comments

@@ @@ -21,6 +21,8 @@ transport_config.h @@
 Doxyfile
 moc_*
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
 *.patch
 *.orig
 spectrum2_manager
@@ @@ -40,4 +42,3 @@ localhost.port @@
 *.a
 core.*
 *.pyc

CMakeLists.txt

➞

Show inline comments

@@ @@ -17,6 +17,8 @@ message(STATUS " : -DPROTOBUF_PROTOC_EXECUTABLE") @@
 message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARY")
 message(STATUS "|- purple  : -DPURPLE_INCLUDE_DIR,   -DPURPLE_LIBRARY")
 message(STATUS "           : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib")
 message(STATUS "|- pgxx    : -DPQXX_INCLUDE_DIR,     -DPQXX_LIBRARY")
 message(STATUS "|- irc     : -DIRC_INCLUDE_DIR,      -DIRC_LIBRARY")
 option(ENABLE_SQLITE3 "Build with SQLite3 support" ON)
 option(ENABLE_MYSQL "Build with MySQL support" ON)

Dockerfile-alpine

➞

Show inline comments

@@ @@ -12,7 +12,7 @@ RUN apk add --no-cache ca-certificates && \ @@
 	wget https://github.com/communi/libcommuni/archive/v3.5.0.tar.gz -O libcommuni-3.5.0.tar.gz && \
 	tar xfz libcommuni-*.tar.gz && \
 	cd libcommuni-* && \
 	./configure && \
+	./configure --prefix=/opt/libcommuni && \
 	make && \
 	make install && \
 	cd .. && \
@@ @@ -21,7 +21,7 @@ RUN apk add --no-cache ca-certificates && \ @@
 	git clone git://git.apache.org/logging-log4cxx.git && \
 	cd logging-log4cxx && \
 	./autogen.sh && \
 	./configure && \
+	./configure --prefix=/opt/log4cxx && \
 	make && \
 	make install && \
 	cd .. && \
@@ @@ -31,7 +31,7 @@ RUN apk add --no-cache ca-certificates && \ @@
 	tar xfz libpqxx-*.tar.gz && \
 	cd libpqxx-* && \
 	./autogen.sh && \
 	./configure --enable-shared --disable-documentation && \
+	./configure --enable-shared --disable-documentation --prefix=/opt/libpqxx && \
 	make && \
 	make install && \
 	cd .. && \
@@ @@ -40,16 +40,18 @@ RUN apk add --no-cache ca-certificates && \ @@
 	wget https://swift.im/downloads/releases/swift-4.0rc2/swift-4.0rc2.tar.gz && \
 	tar xfz swift-*.tar.gz && \
 	cd swift-* && \
-	./scons Swiften SWIFTEN_INSTALLDIR=/usr/local /usr/local && \
+	./scons Swiften SWIFTEN_INSTALLDIR=/opt/_swiften /opt/_swiften && \
 	cd .. && \
 	rm -rf swift-* && \
 	cd spectrum2 && \
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr . && \
+	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLOG4CXX_INCLUDE_DIR=/opt/log4cxx/include -DLOG4CXX_LIBRARY=/opt/log4cxx/lib -DSWIFTEN_INCLUDE_DIR=/opt/_swiften/include -DSWIFTEN_LIBRARY=/opt/_swiften/lib -DSWIFTEN_CONFIG_EXECUTABLE=/opt/_swiften/bin/swiften-config -DPQXX_INCLUDE_DIR=/opt/libpqxx/include -DPQXX_LIBRARY=/opt/libpqxx/lib -DPQ_LIBRARY=/opt/libpqxx/lib -DIRC_INCLUDE_DIR=/opt/libcommuni/include -DIRC_LIBRARY=/opt/libcommuni/lib -DIRC_MODEL_LIBRARY=/opt/libcommuni/lib && \
 	make && \
 	make install && \
 	cd .. && \
 	rm /opt/* -rf && \
 	wget https://github.com/dequis/purple-facebook/releases/download/v0.9.4-c9b74a765767/purple-facebook-0.9.4-c9b74a765767.tar.gz && \
 	tar -xf purple-facebook-0.9.4-c9b74a765767.tar.gz && \
 	cd purple-facebook-0.9.4-c9b74a765767 && \

0 comments (0 inline, 0 general)