From 112bc51fc09147e365e7455f29869fc4983f7aa2 Mon Sep 17 00:00:00 2001
From: Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
Date: Fri, 3 Mar 2017 14:08:10 +0100
Subject: [PATCH] Fixed Jun2016-SP2 Dockerfile to listen from any host
---
Dockerfile | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4c4285b..47800e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,8 +24,7 @@ COPY configs/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
#############################################################
# Enables repos, update system, install packages and clean up
#############################################################
-RUN yum install -y epel-release \
- wget
+RUN yum -y install epel-release
# Update & upgrade
RUN yum update -y && \
@@ -39,28 +38,27 @@ RUN groupadd -g 5000 monetdb && \
useradd -u 5000 -g 5000 monetdb
# Enable MonetDB repo
-RUN wget -O /etc/yum.repos.d/monetdb.repo https://dev.monetdb.org/downloads/epel/monetdb.repo
-RUN rpm --import https://dev.monetdb.org/downloads/MonetDB-GPG-KEY
+RUN yum install -y http://dev.monetdb.org/downloads/epel/MonetDB-release-epel-1.1-1.monetdb.noarch.rpm
+RUN rpm --import http://dev.monetdb.org/downloads/MonetDB-GPG-KEY
-ARG MonetDBVersion=11.25.5
+# Update & upgrade
+RUN yum update -y
-# Install MonetDB clients
-RUN yum install -y MonetDB-stream-$MonetDBVersion \
- MonetDB-client-$MonetDBVersion \
- MonetDB-client-tools-$MonetDBVersion \
- MonetDB-client-odbc-$MonetDBVersion
+ARG MonetDBVersion=11.23.13
# Install MonetDB server
RUN yum install -y MonetDB-$MonetDBVersion \
- MonetDB-SQL-server5-hugeint-$MonetDBVersion
+ MonetDB-stream-$MonetDBVersion \
+ MonetDB-client-$MonetDBVersion \
+ MonetDB-SQL-server5-$MonetDBVersion \
+ MonetDB-SQL-server5-hugeint-$MonetDBVersion \
+ MonetDB5-server-$MonetDBVersion \
+ MonetDB5-server-hugeint-$MonetDBVersion
# Install MonetDB extensions
RUN yum install -y MonetDB-geom-MonetDB5-$MonetDBVersion \
MonetDB-gsl-MonetDB5-$MonetDBVersion \
- MonetDB-R-$MonetDBVersion \
- MonetDB-python2-$MonetDBVersion
-
-# RUN yum install -y MonetDB-lidar-$MonetDBVersion
+ MonetDB-R-$MonetDBVersion
# Clean up
RUN yum -y clean all
@@ -80,9 +78,13 @@ COPY configs/.monetdb /home/monetdb/.monetdb
COPY scripts/init-db.sh /home/monetdb/init-db.sh
RUN chmod +x /home/monetdb/init-db.sh
-# Init the db in a scipt to allow more than one process to run in the container
+# As of the Jun2016 release, we have to set the property listenaddr to any host
+# because now it only listens to the localhost by default
+RUN echo "listenaddr=0.0.0.0" >> /var/monetdb5/dbfarm/.merovingian_properties
+
+# Init the db in a script to allow more than one process to run in the container
# We need two: one for monetdbd and one for mserver
-# The sript will init the database with using the unpreveledged user monetdb
+# The script will init the database with using the unprivileged user monetdb
RUN su -c 'sh /home/monetdb/init-db.sh' monetdb
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
--
GitLab