diff --git a/Dockerfile b/Dockerfile index 8d454e8..d4e0ead 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,9 @@ -FROM registry.fedoraproject.org/fedora:25 +FROM registry.fedoraproject.org/fedora:26 LABEL MAINTAINER SoftwareCollections.org -ENV NAME=mongodb \ - VERSION=0 \ - RELEASE=1 \ - ARCH=x86_64 +ENV NAME=mongodb VERSION=0 RELEASE=6 ARCH=x86_64 -LABEL com.redhat.component = "$NAME" \ +LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ release="$RELEASE.$DISTTAG" \ @@ -15,11 +12,11 @@ LABEL com.redhat.component = "$NAME" \ help="help.1" LABEL io.k8s.description="MongoDB is a scalable, high-performance, open source NoSQL database." \ - io.k8s.display-name="MongoDB 3.2" \ + io.k8s.display-name="MongoDB 3.4" \ io.openshift.expose-services="27017:mongodb" \ io.openshift.tags="database,mongodb" -ENV MONGODB_VERSION=3.2 \ +ENV MONGODB_VERSION=3.4 \ # Set paths to avoid hard-coding them in scripts. HOME=/var/lib/mongodb \ CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/mongodb @@ -29,7 +26,7 @@ EXPOSE 27017 ENTRYPOINT ["container-entrypoint"] CMD ["run-mongod"] -RUN INSTALL_PKGS="bind-utils gettext iproute rsync tar findutils python mongodb mongodb-server mongo-tools" && \ +RUN INSTALL_PKGS="bind-utils gettext iproute rsync tar findutils python3 mongodb mongodb-server mongo-tools" && \ dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ dnf clean all diff --git a/root/usr/bin/cgroup-limits b/root/usr/bin/cgroup-limits index b9d4edc..f50bbbb 100755 --- a/root/usr/bin/cgroup-limits +++ b/root/usr/bin/cgroup-limits @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 """ Script for parsing cgroup information diff --git a/root/usr/share/container-scripts/mongodb/common.sh b/root/usr/share/container-scripts/mongodb/common.sh index 5333d9b..c08dbc5 100644 --- a/root/usr/share/container-scripts/mongodb/common.sh +++ b/root/usr/share/container-scripts/mongodb/common.sh @@ -190,7 +190,7 @@ function setup_wiredtiger_cache() { return 0; fi - cache_size=$(python -c "min=1; limit=int(($MEMORY_LIMIT_IN_BYTES / pow(2,30) - 1) * 0.6); print( min if limit < min else limit)") + cache_size=$(python3 -c "min=1; limit=int(($MEMORY_LIMIT_IN_BYTES / pow(2,30) - 1) * 0.6); print( min if limit < min else limit)") echo "storage.wiredTiger.engineConfig.cacheSizeGB: ${cache_size}" >> ${config_file} info "wiredTiger cacheSizeGB set to ${cache_size}"