Fixed Dockerfile so it patches everything in-place.

EMCECS · Jul 14, 2017 · 867189e · 867189e
1 parent 25ec584
commit 867189e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 277 deletions.
diff --git a/patches/3.0.0.0-86889.0a0ee19/Dockerfile b/patches/3.0.0.0-86889.0a0ee19/Dockerfile
@@ -2,13 +2,11 @@
 FROM emcvipr/object:3.0.0.0-86889.0a0ee19-reduced
 
 # Increase memory for transformsvc
-ADD transformsvc /opt/storageos/bin/
+RUN sed -i s/-Xmx128m/-Xmx512m/ /opt/storageos/bin/transformsvc
 
 # Fix disk partitioning script
-ADD storageserver-partition-config.sh /opt/storageos/bin/
-RUN /usr/bin/chmod +x /opt/storageos/bin/storageserver-partition-config.sh
+RUN sed -i '/VMware/ s/$/ \&\& [ ! -e \/data\/is_community_edition ]/' /opt/storageos/bin/storageserver-partition-config.sh
 
 # Make vnest use separate thread pools to prevent deadlock
-ADD vnest.object.properties /opt/storageos/conf/
+RUN printf "\n# Use separate thread pools to prevent deadlock in vnest init\nobject.UseSeparateThreadPools=true\n" >> /opt/storageos/conf/vnest.object.properties
 
-RUN f=/opt/storageos/conf/vnest-common-conf-template.xml; grep -q "object.UseSeparateThreadPools" $f || sed -i '/properties id="serviceProperties"/a \ \ \ \ \ \ \ \ <prop key="object.UseSeparateThreadPools">true</prop>' $f
diff --git a/patches/3.0.0.0-86889.0a0ee19/storageserver-partition-config.sh b/patches/3.0.0.0-86889.0a0ee19/storageserver-partition-config.sh
diff --git a/patches/3.0.0.0-86889.0a0ee19/transformsvc b/patches/3.0.0.0-86889.0a0ee19/transformsvc
diff --git a/patches/3.0.0.0-86889.0a0ee19/vnest.object.properties b/patches/3.0.0.0-86889.0a0ee19/vnest.object.properties