bump version

Solinea · Jun 4, 2016 · 9e172a5 · 9e172a5
1 parent 81e0d6a
commit 9e172a5
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 27 deletions.
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
@@ -18,14 +18,14 @@ version: '2'
 services:
   # Database Container
   gsdb:
-    image: solinea/goldstone-db:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-db:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     env_file: ./config/goldstone-test.env
     ports:
       - "5432:5432"
 
   # Logstash Container
   gslog:
-    image: solinea/goldstone-log:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-log:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "5514:5514"
       - "5515:5515"
@@ -36,22 +36,22 @@ services:
 
   # Elasticsearch Container
   gssearch:
-    image: solinea/goldstone-search:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-search:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "9200:9200"
       - "9300:9300"
 
   # Celery Task Queue Container
   gstaskq:
-    image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "6379:6379"
 
   #
   # Celery container
   #
   gstask:
-    image: solinea/goldstone-task:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-task:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     env_file: ./config/goldstone-test.env
     links:
       - gsdb

diff --git a/docker/docker-compose-enterprise.yml b/docker/docker-compose-enterprise.yml
@@ -19,7 +19,7 @@ services:
 
   # Goldstone Proxy & Static
   gsweb:
-    image: solinea/goldstone-web:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-web:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "8443:8443"
     links:
@@ -32,7 +32,7 @@ services:
 
   # Goldstone Server Container
   gsapp:
-    image: gs-docker-ent.bintray.io/goldstone-app-e:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: gs-docker-ent.bintray.io/goldstone-app-e:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     env_file: ./config/goldstone-prod.env
     ports:
       - "8000:8000"
@@ -49,7 +49,7 @@ services:
 
   # Database Container
   gsdb:
-    image: solinea/goldstone-db:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-db:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     env_file: ./config/goldstone-prod.env
     volumes:
       - /var/lib/goldstone/sql_data:/var/lib/postgresql/data
@@ -63,7 +63,7 @@ services:
 
   # Logstash Container
   gslog:
-    image: solinea/goldstone-log:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-log:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "5514:5514"
       - "5515:5515"
@@ -79,7 +79,7 @@ services:
 
   # Elasticsearch Container
   gssearch:
-    image: solinea/goldstone-search:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-search:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "9200:9200"
       - "9300:9300"
@@ -93,7 +93,7 @@ services:
 
   # Celery Task Queue Container
   gstaskq:
-    image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "6379:6379"
     logging:
@@ -106,7 +106,7 @@ services:
   # Celery container
   #
   gstask:
-    image: gs-docker-ent.bintray.io/goldstone-task-e:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: gs-docker-ent.bintray.io/goldstone-task-e:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     env_file: ./config/goldstone-prod.env
     links:
       - gsdb

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -19,7 +19,7 @@ services:
 
   # Goldstone Proxy & Static
   gsweb:
-    image: solinea/goldstone-web:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-web:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "8443:8443"
     links:
@@ -32,7 +32,7 @@ services:
 
   # Goldstone Server Container
   gsapp:
-    image: solinea/goldstone-app:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-app:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     env_file: ./config/goldstone-prod.env
     ports:
       - "8000:8000"
@@ -49,7 +49,7 @@ services:
 
   # Database Container
   gsdb:
-    image: solinea/goldstone-db:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-db:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     env_file: ./config/goldstone-prod.env
     volumes:
       - /var/lib/goldstone/sql_data:/var/lib/postgresql/data
@@ -63,7 +63,7 @@ services:
 
   # Logstash Container
   gslog:
-    image: solinea/goldstone-log:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-log:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "5514:5514"
       - "5515:5515"
@@ -79,7 +79,7 @@ services:
 
   # Elasticsearch Container
   gssearch:
-    image: solinea/goldstone-search:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-search:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "9200:9200"
       - "9300:9300"
@@ -93,7 +93,7 @@ services:
 
   # Celery Task Queue Container
   gstaskq:
-    image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     ports:
       - "6379:6379"
     logging:
@@ -106,7 +106,7 @@ services:
   # Celery container
   #
   gstask:
-    image: solinea/goldstone-task:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+    image: solinea/goldstone-task:1.1.1-SNAPSHOT.296.g81e0d6a.develop
     env_file: ./config/goldstone-prod.env
     links:
       - gsdb

diff --git a/docker/goldstone-app-e/Dockerfile b/docker/goldstone-app-e/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM solinea/goldstone-base:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+FROM solinea/goldstone-base:1.1.1-SNAPSHOT.296.g81e0d6a.develop
 
 MAINTAINER Luke Heidecke <[email protected]>
 

diff --git a/docker/goldstone-app/Dockerfile b/docker/goldstone-app/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM solinea/goldstone-base:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+FROM solinea/goldstone-base:1.1.1-SNAPSHOT.296.g81e0d6a.develop
 
 MAINTAINER Luke Heidecke <[email protected]>
 

diff --git a/docker/goldstone-base/docker-entrypoint.sh b/docker/goldstone-base/docker-entrypoint.sh
@@ -46,9 +46,11 @@ if [[ $status == "DOWN" ]] ; then
     exit 1
 fi
 
-if [ ! -f /var/tmp/goldstone-testlibs ] ; then
-    pip install -r ${APPDIR}/config/test-requirements.txt
-    touch /var/tmp/goldstone-testlibs
+if [[ $GS_INSTALL_TESTLIBS == 'true' ]] ; then
+    if [ ! -f /var/tmp/goldstone-testlibs ] ; then
+        pip install -r ${APPDIR}/config/test-requirements.txt
+        touch /var/tmp/goldstone-testlibs
+    fi
 fi
 
 if [ ! -f /var/tmp/goldstone-migrated ] ; then

diff --git a/docker/goldstone-task-e/Dockerfile b/docker/goldstone-task-e/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM solinea/goldstone-base:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+FROM solinea/goldstone-base:1.1.1-SNAPSHOT.296.g81e0d6a.develop
 
 MAINTAINER Luke Heidecke <[email protected]>
 

diff --git a/docker/goldstone-task/Dockerfile b/docker/goldstone-task/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM solinea/goldstone-base:1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup
+FROM solinea/goldstone-base:1.1.1-SNAPSHOT.296.g81e0d6a.develop
 
 MAINTAINER Luke Heidecke <[email protected]>
 

diff --git a/goldstone/settings/base.py b/goldstone/settings/base.py
@@ -24,7 +24,7 @@
 from kombu import Exchange, Queue
 
 # this version should be managed by the bump_version.sh script
-GOLDSTONE_VERSION = '1.1.1-SNAPSHOT.286.gb2546eb.prepkg.cleanup'
+GOLDSTONE_VERSION = '1.1.1-SNAPSHOT.296.g81e0d6a.develop'
 
 CURRENT_DIR = os.path.dirname(__file__)
 TEMPLATE_DIRS = (os.path.join(CURRENT_DIR, '../templates'),)