diff --git a/README.md b/README.md index fe871454..c7184840 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![](https://images.microbadger.com/badges/version/emccorp/ecs-install.svg)](https://microbadger.com/images/emccorp/ecs-install "Get your own version badge on microbadger.com") **ECS Software Image** -[![](https://images.microbadger.com/badges/version/emccorp/ecs-software-3.4.0.svg)](https://microbadger.com/images/emccorp/ecs-software-3.4.0 "Get your own version badge on microbadger.com") +[![](https://images.microbadger.com/badges/version/emccorp/ecs-software-3.5.0.svg)](https://microbadger.com/images/emccorp/ecs-software-3.5.0 "Get your own version badge on microbadger.com") Current releases and history are available [here][releases]. diff --git a/docs/source/conf.py b/docs/source/conf.py index d001895e..a5c53215 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -54,9 +54,9 @@ # built documents. # # The short X.Y version. -version = u'3.4' +version = u'3.5' # The full version, including alpha/beta/rc tags. -release = u'3.4.0.0' +release = u'3.5.0.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/patches/3.5.0.0/Dockerfile b/patches/3.5.0.0/Dockerfile new file mode 100644 index 00000000..24793f35 --- /dev/null +++ b/patches/3.5.0.0/Dockerfile @@ -0,0 +1,27 @@ +# Fixes to the default 3.5.0.0 reduced image. + +# Build on object-reduced image (GA release) +FROM emcvipr/object:3.5.0.0-120520.8c29468ee8b-reduced + +# Fix disk partitioning script +RUN sed -i '/VMware/ s/$/ \&\& [ ! -e \/data\/is_community_edition ]/' /opt/storageos/bin/storageserver-partition-config.sh \ + && /usr/bin/chmod +x /opt/storageos/bin/storageserver-partition-config.sh + +# Set VNest useSeperateThreadPools to True +#RUN f=/opt/storageos/conf/vnest-common-conf.xml; grep -q "object.UseSeparateThreadPools" $f || sed -i '/properties id="serviceProperties"/a \ \ \ \ \ \ \ \ true' $f + +# Allow allocation of different blocks of a chunk to be stored on the same partition +#RUN f=/opt/storageos/conf/ssm-cf-conf.xml; grep -q '' $f || sed -i 's###g' /opt/storageos/conf/ssm-cf-conf.xml $f + +## Increase memory for transformsvc +#RUN sed -i s/Xmx128m/Xmx512m/ /opt/storageos/bin/transformsvc + +## Set memory for objcontrolsvc +#RUN sed -i s/Xmx96m/Xmx256m/ /opt/storageos/bin/objcontrolsvc + +# Set georeceiver's initialBufferNumOnHeap to something smaller for CE +#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q 'name="initialBufferNumOnHeap" value="5"' $f || sed -i 's/name="initialBufferNumOnHeap" value="60"/name="initialBufferNumOnHeap" value="5"/' $f +#RUN f=/opt/storageos/conf/georeceiver-conf.xml; grep -q '10' $f || sed -i 's#80#10#g' $f + +# Configure CM Object properties: Disable minimum storage device count +#RUN f=/opt/storageos/conf/cm.object.properties; grep -q 'MustHaveEnoughResources=false' $f || sed -i 's/MustHaveEnoughResources=true/MustHaveEnoughResources=false/' $f diff --git a/patches/3.5.0.0/build.sh b/patches/3.5.0.0/build.sh new file mode 100755 index 00000000..8bfdd7b9 --- /dev/null +++ b/patches/3.5.0.0/build.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +source image.conf + +docker build -t "${IMAGE_REPO}:${IMAGE_VERSION}" . diff --git a/patches/3.5.0.0/image.conf b/patches/3.5.0.0/image.conf new file mode 100644 index 00000000..dc8ec9f2 --- /dev/null +++ b/patches/3.5.0.0/image.conf @@ -0,0 +1,3 @@ +BASE_IMAGE="emcvipr/object:3.5.0.0-120520.8c29468ee8b-reduced" +IMAGE_REPO="emccorp/ecs-software-3.5.0" +IMAGE_VERSION="3.5.0.0" diff --git a/release.conf b/release.conf index 0b3dae73..cc8ee36f 100644 --- a/release.conf +++ b/release.conf @@ -11,6 +11,10 @@ # DO NOT specify an alternate registry here. Use the -r argument to # bootstrap.sh for that. # +### Older versions ( 3.5 ) +# release_artifact="emccorp/ecs-software-3.5.0" +# release_tag="latest" +# ### Older versions ( 3.4 ) # release_artifact="emccorp/ecs-software-3.4.0" # release_tag="latest" diff --git a/ui/etc/config.yml b/ui/etc/config.yml index 765481a3..380de4cf 100644 --- a/ui/etc/config.yml +++ b/ui/etc/config.yml @@ -13,7 +13,7 @@ --- ui: name: ECS Community Edition Install Node - version: 2.9.1r + version: 2.9.3r host_root_dir: /opt/emc/ecs-install state_file: /opt/state.yml deploy_file: /opt/deploy.yml @@ -32,7 +32,7 @@ ui: ffx_sem: /opt/ffx.sem product: name: ECS - version: 3.4.0.0 + version: 3.5.0.0 vendor: Dell EMC flavor: Community Edition slogan: Free and Frictionless diff --git a/ui/etc/release.conf b/ui/etc/release.conf index efa8a4c0..cc991499 100644 --- a/ui/etc/release.conf +++ b/ui/etc/release.conf @@ -8,10 +8,10 @@ # it is provided by or on behalf of EMC. release_name="ECS Community Edition" -release_version="3.4.0.0" +release_version="3.5.0.0" release_product="ECS Software" -release_artifact="emccorp/ecs-software-3.4.0" -release_tag="3.4.0.0" +release_artifact="emccorp/ecs-software-3.5.0" +release_tag="3.5.0.0" release_common_name="emccorp/ecs-software:latest" docker_host_root="/opt/emc/ecs-install" @@ -32,7 +32,7 @@ image_name='ecs-install' tag='latest' ver_maj='2' ver_min='9' -ver_rev='2' +ver_rev='3' ver_tag='r' serial=0 diff --git a/ui/setup.py b/ui/setup.py index 32144845..899f6677 100755 --- a/ui/setup.py +++ b/ui/setup.py @@ -3,7 +3,7 @@ setup( name='ecsdeploy', - version='2.10.0r', + version='2.9.3r', packages=find_packages(), scripts=['ui.py', 'ecsdeploy.py',