From 3dc340aa312a66bce641c41f97a6d4ce1c6e5e4b Mon Sep 17 00:00:00 2001
From: Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
Date: Mon, 20 Feb 2017 17:09:05 +0100
Subject: [PATCH] Updated Dockerfile to Dec2016-SP1
---
Dockerfile | 5 +++--
README.md | 12 ++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index e91c282..4c4285b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd -g 5000 monetdb && \
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
-ARG MonetDBVersion=11.23.13
+ARG MonetDBVersion=11.25.5
# Install MonetDB clients
RUN yum install -y MonetDB-stream-$MonetDBVersion \
@@ -57,7 +57,8 @@ RUN yum install -y MonetDB-$MonetDBVersion \
# Install MonetDB extensions
RUN yum install -y MonetDB-geom-MonetDB5-$MonetDBVersion \
MonetDB-gsl-MonetDB5-$MonetDBVersion \
- MonetDB-R-$MonetDBVersion
+ MonetDB-R-$MonetDBVersion \
+ MonetDB-python2-$MonetDBVersion
# RUN yum install -y MonetDB-lidar-$MonetDBVersion
diff --git a/README.md b/README.md
index fc16cbd..0955a2a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,9 @@ monetdb-r-docker
Docker container for [MonetDB with R](https://www.monetdb.org/content/embedded-r-monetdb). Based on CentOS 7.
# Supported tags and respective Dockerfile links
-* [`July2015-SP4`, `11.21.19`, `latest` (Dockerfile)](https://github.com/MonetDB/monetdb-r-docker/blob/11.21.19/Dockerfile)
+* [`Dec2016-SP1`, `11.25.5`, `latest` (Dockerfile)](https://github.com/MonetDB/monetdb-r-docker/blob/dec2016-sp1/Dockerfile)
+* [`June2016-SP2`, `11.23.13` (Dockerfile)](https://github.com/MonetDB/monetdb-r-docker/blob/june2016-sp2/Dockerfile)
+* [`July2015-SP4`, `11.21.19` (Dockerfile)](https://github.com/MonetDB/monetdb-r-docker/blob/11.21.19/Dockerfile)
* [`July2015-SP3`, `11.21.17` (Dockerfile)](https://github.com/MonetDB/monetdb-r-docker/blob/11.21.17/Dockerfile)
* [`July2015-SP1`, `11.21.11` (Dockerfile)](https://github.com/MonetDB/monetdb-r-docker/blob/11.21.11/Dockerfile)
* [`July2015`, `11.21.5` (Dockerfile)](https://github.com/MonetDB/monetdb-r-docker/blob/11.21.5/Dockerfile)
@@ -53,13 +55,15 @@ docker build --rm -t <yourname>/monetdb-r-docker .
The MonetDB image is based on the CentOS 7. We migrated from Fedora (latest).
## Software
The image includes the latest stable version of the software available for CentOS at build time:
-* MonetDB
+* MonetDB server with hugeint support
* R module for embedded R support
- * R
+* Python2 module for embedded Python support (since Dec2016 only)
* GEOS module
* GSL module
+* Mclient - The native MonetDB client
+* MonetDB ODBC driver
-The default database on the image has R integration enabled.
+The default database on the image has R and Python2 integration enabled.
## Ports
MonetDB runs on port `50000` by default, which is exposed on the image.
--
GitLab