Skip to content

Commit

Permalink
bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
jxstanford committed Jun 4, 2016
1 parent 9e172a5 commit 3d2f184
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 24 deletions.
10 changes: 5 additions & 5 deletions docker/docker-compose-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ version: '2'
services:
# Database Container
gsdb:
image: solinea/goldstone-db:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-db:1.1.1-SNAPSHOT.297.g9e172a5.develop
env_file: ./config/goldstone-test.env
ports:
- "5432:5432"

# Logstash Container
gslog:
image: solinea/goldstone-log:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-log:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "5514:5514"
- "5515:5515"
Expand All @@ -36,22 +36,22 @@ services:

# Elasticsearch Container
gssearch:
image: solinea/goldstone-search:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-search:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "9200:9200"
- "9300:9300"

# Celery Task Queue Container
gstaskq:
image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "6379:6379"

#
# Celery container
#
gstask:
image: solinea/goldstone-task:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-task:1.1.1-SNAPSHOT.297.g9e172a5.develop
env_file: ./config/goldstone-test.env
links:
- gsdb
Expand Down
14 changes: 7 additions & 7 deletions docker/docker-compose-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:

# Goldstone Proxy & Static
gsweb:
image: solinea/goldstone-web:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-web:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "8443:8443"
links:
Expand All @@ -32,7 +32,7 @@ services:

# Goldstone Server Container
gsapp:
image: gs-docker-ent.bintray.io/goldstone-app-e:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: gs-docker-ent.bintray.io/goldstone-app-e:1.1.1-SNAPSHOT.297.g9e172a5.develop
env_file: ./config/goldstone-prod.env
ports:
- "8000:8000"
Expand All @@ -49,7 +49,7 @@ services:

# Database Container
gsdb:
image: solinea/goldstone-db:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-db:1.1.1-SNAPSHOT.297.g9e172a5.develop
env_file: ./config/goldstone-prod.env
volumes:
- /var/lib/goldstone/sql_data:/var/lib/postgresql/data
Expand All @@ -63,7 +63,7 @@ services:

# Logstash Container
gslog:
image: solinea/goldstone-log:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-log:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "5514:5514"
- "5515:5515"
Expand All @@ -79,7 +79,7 @@ services:

# Elasticsearch Container
gssearch:
image: solinea/goldstone-search:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-search:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "9200:9200"
- "9300:9300"
Expand All @@ -93,7 +93,7 @@ services:

# Celery Task Queue Container
gstaskq:
image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "6379:6379"
logging:
Expand All @@ -106,7 +106,7 @@ services:
# Celery container
#
gstask:
image: gs-docker-ent.bintray.io/goldstone-task-e:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: gs-docker-ent.bintray.io/goldstone-task-e:1.1.1-SNAPSHOT.297.g9e172a5.develop
env_file: ./config/goldstone-prod.env
links:
- gsdb
Expand Down
14 changes: 7 additions & 7 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:

# Goldstone Proxy & Static
gsweb:
image: solinea/goldstone-web:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-web:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "8443:8443"
links:
Expand All @@ -32,7 +32,7 @@ services:

# Goldstone Server Container
gsapp:
image: solinea/goldstone-app:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-app:1.1.1-SNAPSHOT.297.g9e172a5.develop
env_file: ./config/goldstone-prod.env
ports:
- "8000:8000"
Expand All @@ -49,7 +49,7 @@ services:

# Database Container
gsdb:
image: solinea/goldstone-db:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-db:1.1.1-SNAPSHOT.297.g9e172a5.develop
env_file: ./config/goldstone-prod.env
volumes:
- /var/lib/goldstone/sql_data:/var/lib/postgresql/data
Expand All @@ -63,7 +63,7 @@ services:

# Logstash Container
gslog:
image: solinea/goldstone-log:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-log:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "5514:5514"
- "5515:5515"
Expand All @@ -79,7 +79,7 @@ services:

# Elasticsearch Container
gssearch:
image: solinea/goldstone-search:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-search:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "9200:9200"
- "9300:9300"
Expand All @@ -93,7 +93,7 @@ services:

# Celery Task Queue Container
gstaskq:
image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-task-queue:1.1.1-SNAPSHOT.297.g9e172a5.develop
ports:
- "6379:6379"
logging:
Expand All @@ -106,7 +106,7 @@ services:
# Celery container
#
gstask:
image: solinea/goldstone-task:1.1.1-SNAPSHOT.296.g81e0d6a.develop
image: solinea/goldstone-task:1.1.1-SNAPSHOT.297.g9e172a5.develop
env_file: ./config/goldstone-prod.env
links:
- gsdb
Expand Down
2 changes: 1 addition & 1 deletion docker/goldstone-app-e/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.296.g81e0d6a.develop
FROM solinea/goldstone-base:1.1.1-SNAPSHOT.297.g9e172a5.develop

MAINTAINER Luke Heidecke <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion docker/goldstone-app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.296.g81e0d6a.develop
FROM solinea/goldstone-base:1.1.1-SNAPSHOT.297.g9e172a5.develop

MAINTAINER Luke Heidecke <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion docker/goldstone-task-e/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.296.g81e0d6a.develop
FROM solinea/goldstone-base:1.1.1-SNAPSHOT.297.g9e172a5.develop

MAINTAINER Luke Heidecke <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion docker/goldstone-task/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.296.g81e0d6a.develop
FROM solinea/goldstone-base:1.1.1-SNAPSHOT.297.g9e172a5.develop

MAINTAINER Luke Heidecke <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion goldstone/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.296.g81e0d6a.develop'
GOLDSTONE_VERSION = '1.1.1-SNAPSHOT.297.g9e172a5.develop'

CURRENT_DIR = os.path.dirname(__file__)
TEMPLATE_DIRS = (os.path.join(CURRENT_DIR, '../templates'),)
Expand Down

0 comments on commit 3d2f184

Please sign in to comment.