Skip to content

Commit

Permalink
merged with master and updated labels to v1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cfregly committed May 17, 2017
1 parent b2f6ed9 commit 1a7cb14
Show file tree
Hide file tree
Showing 116 changed files with 142 additions and 142 deletions.
2 changes: 1 addition & 1 deletion apachespark.ml/2.1.0/Dockerfile.master
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-spark-2.1.0:master
FROM fluxcapacitor/package-spark-2.1.0:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion apachespark.ml/2.1.0/Dockerfile.worker
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-spark-2.1.0:master
FROM fluxcapacitor/package-spark-2.1.0:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion apachespark.ml/master-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: apachespark-master-2-1-0
image: docker.io/fluxcapacitor/apachespark-master-2.1.0:master
image: docker.io/fluxcapacitor/apachespark-master-2.1.0:v1.2.0
resources:
limits:
cpu: 1000m
Expand Down
2 changes: 1 addition & 1 deletion apachespark.ml/worker-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: apachespark-worker-2-1-0
image: docker.io/fluxcapacitor/apachespark-worker-2.1.0:master
image: docker.io/fluxcapacitor/apachespark-worker-2.1.0:v1.2.0
resources:
limits:
cpu: 1000m
Expand Down
2 changes: 1 addition & 1 deletion cassandra.ml/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion cassandra.ml/cassandra-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: cassandra
image: docker.io/fluxcapacitor/cassandra:master
image: docker.io/fluxcapacitor/cassandra:v1.2.0
resources:
limits:
cpu: 1000m
Expand Down
4 changes: 2 additions & 2 deletions clustered.ml/tensorflow-ps-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: clustered-tensorflow-ps
image: docker.io/fluxcapacitor/clustered-tensorflow:master
image: docker.io/fluxcapacitor/clustered-tensorflow:v1.2.0
imagePullPolicy: "Always"
env:
- name: GET_HOSTS_FROM
Expand All @@ -37,4 +37,4 @@ spec:
- name: git-volume
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml.git"
revision: "master"
revision: "v1.2.0"
4 changes: 2 additions & 2 deletions clustered.ml/tensorflow-worker-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: clustered-tensorflow-worker
image: docker.io/fluxcapacitor/clustered-tensorflow:master
image: docker.io/fluxcapacitor/clustered-tensorflow:v1.2.0
imagePullPolicy: "Always"
env:
- name: GET_HOSTS_FROM
Expand All @@ -37,4 +37,4 @@ spec:
- name: git-volume
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml.git"
revision: "master"
revision: "v1.2.0"
2 changes: 1 addition & 1 deletion clustered.ml/tensorflow/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-ubuntu-16.04:master
FROM fluxcapacitor/package-ubuntu-16.04:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion clustered.ml/tensorflow/Dockerfile.gpu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-gpu-cuda8-16.04:master
FROM fluxcapacitor/package-gpu-cuda8-16.04:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion dashboard.ml/hystrix-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: dashboard-hystrix
image: docker.io/fluxcapacitor/dashboard-hystrix:master
image: docker.io/fluxcapacitor/dashboard-hystrix:v1.2.0
resources:
limits:
cpu: 1000m
Expand Down
2 changes: 1 addition & 1 deletion dashboard.ml/hystrix/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

# Notes:
# The contents ond tools installed in this Dockerfile have only been tested on Ubuntu 14.04.
Expand Down
2 changes: 1 addition & 1 deletion dashboard.ml/turbine-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: dashboard-turbine
image: docker.io/fluxcapacitor/dashboard-turbine:master
image: docker.io/fluxcapacitor/dashboard-turbine:v1.2.0
imagePullPolicy: "Always"
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion dashboard.ml/turbine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

ENV \
SPRING_CORE_VERSION=4.3.0.RELEASE \
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch.ml/2.3.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

RUN \
adduser --system --disabled-password --gecos '' elasticsearch \
Expand Down
2 changes: 1 addition & 1 deletion elasticsearch.ml/5.0.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

RUN \
sysctl -w vm.max_map_count=262144
Expand Down
4 changes: 2 additions & 2 deletions elasticsearch.ml/elasticsearch-2-3-0-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: elasticsearch-2-3-0
image: docker.io/fluxcapacitor/elasticsearch-2.3.0:master
image: docker.io/fluxcapacitor/elasticsearch-2.3.0:v1.2.0
resources:
limits:
cpu: 1000m
Expand All @@ -37,4 +37,4 @@ spec:
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml"
# repository: "https://[o-auth-personal-acess-token]:x-oauth-basic@github.com/fluxcapacitor/source.ml.git"
revision: "master"
revision: "v1.2.0"
4 changes: 2 additions & 2 deletions elasticsearch.ml/elasticsearch-5-0-0-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: elasticsearch-5-0-0
image: docker.io/fluxcapacitor/elasticsearch-5.0.0:master
image: docker.io/fluxcapacitor/elasticsearch-5.0.0:v1.2.0
resources:
limits:
cpu: 1000m
Expand All @@ -37,4 +37,4 @@ spec:
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml"
# repository: "https://[o-auth-personal-acess-token]:x-oauth-basic@github.com/fluxcapacitor/source.ml.git"
revision: "master"
revision: "v1.2.0"
4 changes: 2 additions & 2 deletions gpu.ml/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#FROM fluxcapacitor/package-tensorflow-2a48110-4d0a571-gpu:master
#FROM fluxcapacitor/package-tensorflow-2a48110-4d0a571-gpu:v1.2.0
# Changing to -no-avx mode as we might end up on cloud instance hardware that does not support avx.
# TensorFlow crashes in this case.
FROM fluxcapacitor/package-tensorflow-2a48110-4d0a571-gpu-no-avx:master
FROM fluxcapacitor/package-tensorflow-2a48110-4d0a571-gpu-no-avx:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion hdfs.ml/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

WORKDIR /root

Expand Down
4 changes: 2 additions & 2 deletions hdfs.ml/namenode-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: hdfs-namenode
image: docker.io/fluxcapacitor/hdfs-namenode:master
image: docker.io/fluxcapacitor/hdfs-namenode:v1.2.0
resources:
limits:
cpu: 1000m
Expand Down Expand Up @@ -44,4 +44,4 @@ spec:
- name: git-volume
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml"
revision: "master"
revision: "v1.2.0"
2 changes: 1 addition & 1 deletion jupyterhub.ml/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-spark-2.1.0:master
FROM fluxcapacitor/package-spark-2.1.0:v1.2.0

WORKDIR /root

Expand Down
4 changes: 2 additions & 2 deletions jupyterhub.ml/jupyterhub-deploy-github-oauth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: jupyterhub
image: docker.io/fluxcapacitor/jupyterhub:master
image: docker.io/fluxcapacitor/jupyterhub:v1.2.0
resources:
limits:
cpu: 1000m
Expand Down Expand Up @@ -72,4 +72,4 @@ spec:
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml"
# repository: "https://[o-auth-personal-acess-token]:x-oauth-basic@github.com/fluxcapacitor/source.ml.git"
revision: "master"
revision: "v1.2.0"
4 changes: 2 additions & 2 deletions jupyterhub.ml/jupyterhub-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: jupyterhub
image: docker.io/fluxcapacitor/jupyterhub:master
image: docker.io/fluxcapacitor/jupyterhub:v1.2.0
resources:
limits:
cpu: 1000m
Expand Down Expand Up @@ -63,4 +63,4 @@ spec:
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml"
# repository: "https://[o-auth-personal-acess-token]:x-oauth-basic@github.com/fluxcapacitor/source.ml.git"
revision: "master"
revision: "v1.2.0"
4 changes: 2 additions & 2 deletions keyvalue.ml/redis-master-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: keyvalue-redis-master
image: docker.io/fluxcapacitor/keyvalue-redis-master:master
image: docker.io/fluxcapacitor/keyvalue-redis-master:v1.2.0
resources:
limits:
cpu: 1000m
Expand All @@ -38,4 +38,4 @@ spec:
- name: git-volume
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml"
revision: "master"
revision: "v1.2.0"
2 changes: 1 addition & 1 deletion keyvalue.ml/redis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-ubuntu-16.04:master
FROM fluxcapacitor/package-ubuntu-16.04:v1.2.0

ENV \
DYNO_VERSION=1.4.7 \
Expand Down
2 changes: 1 addition & 1 deletion kibana.ml/4.5.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion kibana.ml/5.0.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

WORKDIR /root

Expand Down
4 changes: 2 additions & 2 deletions kibana.ml/kibana-4-5-0-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: kibana-4-5-0
image: docker.io/fluxcapacitor/kibana-4.5.0:master
image: docker.io/fluxcapacitor/kibana-4.5.0:v1.2.0
resources:
limits:
cpu: 1000m
Expand All @@ -36,4 +36,4 @@ spec:
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml"
# repository: "https://[o-auth-personal-acess-token]:x-oauth-basic@github.com/fluxcapacitor/source.ml.git"
revision: "master"
revision: "v1.2.0"
4 changes: 2 additions & 2 deletions kibana.ml/kibana-5-0-0-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: kibana-5-0-0
image: docker.io/fluxcapacitor/kibana-5.0.0:master
image: docker.io/fluxcapacitor/kibana-5.0.0:v1.2.0
resources:
limits:
cpu: 1000m
Expand All @@ -36,4 +36,4 @@ spec:
gitRepo:
repository: "https://github.com/fluxcapacitor/source.ml"
# repository: "https://[o-auth-personal-acess-token]:x-oauth-basic@github.com/fluxcapacitor/source.ml.git"
revision: "master"
revision: "v1.2.0"
2 changes: 1 addition & 1 deletion kubernetes.ml/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-ubuntu-16.04:master
FROM fluxcapacitor/package-ubuntu-16.04:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion kubernetes.ml/Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-ubuntu-16.04:master
FROM fluxcapacitor/package-ubuntu-16.04:v1.2.0

ENV KUBERNETES_VERSION=1.6.2

Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxcapacitor/package-java-openjdk-1.8:master
FROM fluxcapacitor/package-java-openjdk-1.8:v1.2.0

WORKDIR /root

Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-airbnb-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-census-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-equals-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-httpclient-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-java-airbnb-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-keyvalue-useritem-batch-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-keyvalue-useritem-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-minimal-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-python-balancescale-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down
2 changes: 1 addition & 1 deletion loadtest.ml/loadtest-aws-python-simple-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: loadtest
image: docker.io/fluxcapacitor/loadtest:master
image: docker.io/fluxcapacitor/loadtest:v1.2.0
imagePullPolicy: "Always"
env:
- name: TEST_PATHNAMES
Expand Down

0 comments on commit 1a7cb14

Please sign in to comment.