From 69e4f48c6ae85debdf673a3674a7331b50b49cdf 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/9] Don't have space in label assignment --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8d454e8..e615471 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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" \ From 92f6a3eb872e0370c087d1553d7e9a4f3a2b21e4 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/9] 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 e615471..ada33cf 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 148ad6a2368c760ea7a5bc906e202bc66fb1fad5 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 16:15:38 -0500 Subject: [PATCH 3/9] Bump RELEASE for automatic rebuild --- Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ada33cf..d6dde93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 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 366275c30646fff9262fad10feb47aadd9fa96ec Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 8 Jun 2017 22:21:34 -0500 Subject: [PATCH 4/9] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d6dde93..c086394 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 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 ab236445a8209aa5796f9ecc964db32b6d669a1b Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 14 Jun 2017 16:25:47 -0500 Subject: [PATCH 5/9] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c086394..14be3e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 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 ae425582638cd414ff6370c7c19a1fa3cc4bfc83 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 27 Jun 2017 10:45:32 -0500 Subject: [PATCH 6/9] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14be3e7..0306004 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 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 1140ed4c5df19d8a630ca3332c3647b54e384153 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 6 Jul 2017 14:04:48 -0500 Subject: [PATCH 7/9] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0306004..cc82f63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 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" \ From c6fd3732512c67b157a79e546451f96e5aa5941e Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 15:38:32 -0500 Subject: [PATCH 8/9] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cc82f63..a7ef71e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 LABEL MAINTAINER SoftwareCollections.org -ENV NAME=mongodb VERSION=0 RELEASE=6 ARCH=x86_64 +ENV NAME=mongodb VERSION=0 RELEASE=7 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \ From 701c7fb37d580e41fdea837956584e8e5d8630c9 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 10:24:14 -0500 Subject: [PATCH 9/9] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a7ef71e..8b23d95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/fedora:25 LABEL MAINTAINER SoftwareCollections.org -ENV NAME=mongodb VERSION=0 RELEASE=7 ARCH=x86_64 +ENV NAME=mongodb VERSION=0 RELEASE=8 ARCH=x86_64 LABEL com.redhat.component="$NAME" \ name="$FGC/$NAME" \