Skip to content

Commit

Permalink
Update ECS CE Docker image with ECS 3.0.0 Hotfix 2 (#312)
Browse files Browse the repository at this point in the history
* Reorg base files (fix my glitch)

* Fixed Dockerfile so it patches everything in-place.

(cherry picked from commit 867189e)

* update release files to use new image.
  • Loading branch information
padthaitofuhot committed Jul 17, 2017
1 parent ee137b3 commit 904e397
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 292 deletions.
14 changes: 0 additions & 14 deletions patches/3.0.0.0-86889.0a0ee19/Dockerfile

This file was deleted.

119 changes: 0 additions & 119 deletions patches/3.0.0.0-86889.0a0ee19/storageserver-partition-config.sh

This file was deleted.

27 changes: 0 additions & 27 deletions patches/3.0.0.0-86889.0a0ee19/transformsvc

This file was deleted.

126 changes: 0 additions & 126 deletions patches/3.0.0.0-86889.0a0ee19/vnest.object.properties

This file was deleted.

2 changes: 1 addition & 1 deletion patches/3.0.0.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Fixes to the default 3.0HF image.
FROM emcvipr/object:3.1.0.0-93256.00e3410-reduced
FROM emcvipr/object:3.0.0.0-86239.1c9e5ec-reduced

# Increase memory for transformsvc
ADD transformsvc /opt/storageos/bin/
Expand Down
12 changes: 12 additions & 0 deletions patches/3.0.0.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Fixes to the default 3.0 HF2 image.
FROM emcvipr/object:3.0.0.0-86889.0a0ee19-reduced

# Increase memory for transformsvc
RUN sed -i s/-Xmx128m/-Xmx512m/ /opt/storageos/bin/transformsvc

# Fix disk partitioning script
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
RUN printf "\n# Use separate thread pools to prevent deadlock in vnest init\nobject.UseSeparateThreadPools=true\n" >> /opt/storageos/conf/vnest.object.properties

2 changes: 1 addition & 1 deletion patches/3.1.0.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Fixes to the default 3.0HF image.
FROM emcvipr/object:3.0.0.0-86239.1c9e5ec-reduced
FROM emcvipr/object:3.1.0.0-93256.00e3410-reduced

# Increase memory for transformsvc
ADD transformsvc /opt/storageos/bin/
Expand Down

0 comments on commit 904e397

Please sign in to comment.