From e364a943af35ffb7b191a7124f62a4763aaf7a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Skalick=C3=BD?= Date: Wed, 10 May 2017 14:08:10 +0200 Subject: [PATCH 1/7] Don't have space in label assignment Use right base image --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d454e8..b64ceb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:25 +FROM registry.fedoraproject.org/fedora:26 LABEL MAINTAINER SoftwareCollections.org ENV NAME=mongodb \ @@ -6,7 +6,7 @@ ENV NAME=mongodb \ RELEASE=1 \ ARCH=x86_64 -LABEL com.redhat.component = "$NAME" \ +LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ release="$RELEASE.$DISTTAG" \ @@ -15,11 +15,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 From 0e6196a49f438e0da93e8a03469eef110d8da5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Skalick=C3=BD?= Date: Fri, 12 May 2017 11:42:08 +0200 Subject: [PATCH 2/7] Use python3 --- Dockerfile | 2 +- root/usr/bin/cgroup-limits | 2 +- root/usr/share/container-scripts/mongodb/common.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b64ceb6..27bdb67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,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}" From b4d2bf8a719cd415591ea562757bf48f61fddbcc Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Jul 2017 16:20:05 -0500 Subject: [PATCH 3/7] Bump RELEASE for automatic rebuild --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27bdb67..9d2cb6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,7 @@ 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=2 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ From f7e4d6c5e1cb6d1384d221e8aa92b97f781c6174 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 16:53:56 -0500 Subject: [PATCH 4/7] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9d2cb6b..f49690b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 LABEL MAINTAINER SoftwareCollections.org -ENV NAME=mongodb VERSION=0 RELEASE=2 ARCH=x86_64 +ENV NAME=mongodb VERSION=0 RELEASE=3 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ From 1e9d64c43c48f07db81751eadbfdae5ff6ea39e2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 14:01:36 -0500 Subject: [PATCH 5/7] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f49690b..d0f29ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 LABEL MAINTAINER SoftwareCollections.org -ENV NAME=mongodb VERSION=0 RELEASE=3 ARCH=x86_64 +ENV NAME=mongodb VERSION=0 RELEASE=4 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ From eb5f1a7c92f51a7b862981860c654b68310b1679 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 14 Nov 2017 14:17:11 -0600 Subject: [PATCH 6/7] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0f29ba..5d52a68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 LABEL MAINTAINER SoftwareCollections.org -ENV NAME=mongodb VERSION=0 RELEASE=4 ARCH=x86_64 +ENV NAME=mongodb VERSION=0 RELEASE=5 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ From 79c95b7a4efc4dc1d138abe0126a7530ef680d59 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 15 Mar 2018 14:39:23 +0000 Subject: [PATCH 7/7] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5d52a68..d4e0ead 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:26 LABEL MAINTAINER SoftwareCollections.org -ENV NAME=mongodb VERSION=0 RELEASE=5 ARCH=x86_64 +ENV NAME=mongodb VERSION=0 RELEASE=6 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \