VOL-408 First update for this Jira. This update nails down the version
of all containers that have multiple versions. There is one exceptoin
which is the centurylink/ra-certs conatiner that has only one single tag
which is "latest" all others have been nailed to the latest version tag.
Typo in reviewer comments fixed.
Change-Id: I2f015a0939fcedef89b6e102ad92032b11cb5e98
diff --git a/Makefile b/Makefile
index 2f98ccf..4fb8390 100644
--- a/Makefile
+++ b/Makefile
@@ -199,26 +199,28 @@
fetch-jenkins:
docker pull consul:0.9.2
- docker pull fluent/fluentd:latest
- docker pull gliderlabs/registrator:master
+ docker pull fluent/fluentd:v0.14.23.rc1
docker pull ubuntu:xenial
- docker pull wurstmeister/kafka:latest
- docker pull wurstmeister/zookeeper:latest
- docker pull zookeeper:latest
-
+ docker pull wurstmeister/kafka:1.0.0
+ docker pull zookeeper:3.4.11
+ # These images are depricated and should be removed in subsequent commits.
+ docker pull gliderlabs/registrator:v7
+ docker pull wurstmeister/zookeeper:3.4.6
fetch:
docker pull consul:0.9.2
- docker pull fluent/fluentd:latest
- docker pull gliderlabs/registrator:master
+ docker pull fluent/fluentd:v0.14.23.rc1
docker pull ubuntu:xenial
- docker pull wurstmeister/kafka:latest
- docker pull wurstmeister/zookeeper:latest
- docker pull zookeeper:latest
- docker pull nginx:latest
- docker pull portainer/portainer:latest
+ docker pull wurstmeister/kafka:1.0.0
+ docker pull zookeeper:3.4.11
+ docker pull portainer/portainer:1.15.2
docker pull lyft/envoy:29361deae91575a1d46c7a21e913f19e75622ebe
docker pull registry:2
- docker pull kamon/grafana_graphite:latest
+ docker pull kamon/grafana_graphite:3.0
+ # These images are depricated and should be removed in subsequent commits.
+ docker pull gliderlabs/registrator:v7
+ docker pull wurstmeister/zookeeper:3.4.6
+ docker pull nginx:1.13.6
+
purge-venv:
rm -fr ${VENVDIR}
diff --git a/docker/Dockerfile.consul b/docker/Dockerfile.consul
index 48e7347..64f11b2 100644
--- a/docker/Dockerfile.consul
+++ b/docker/Dockerfile.consul
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM consul
+FROM consul:0.9.2
# Create Consul Config Directory
RUN mkdir -p /consul/config
diff --git a/docker/Dockerfile.fluentd b/docker/Dockerfile.fluentd
index 0ca694f..4e04a2f 100644
--- a/docker/Dockerfile.fluentd
+++ b/docker/Dockerfile.fluentd
@@ -16,6 +16,6 @@
#
#DockerFile to Create Fluentd Forwards inside cord-voltha
-FROM fluent/fluentd
+FROM fluent/fluentd:v0.14.23.rc1
COPY fluentd_config/fluent.conf /fluentd/etc/
COPY fluentd_config/fluent-agg.conf /fluentd/etc/
diff --git a/docker/Dockerfile.golang b/docker/Dockerfile.golang
index 1673daa..47765fe 100644
--- a/docker/Dockerfile.golang
+++ b/docker/Dockerfile.golang
@@ -1,4 +1,4 @@
-FROM golang:latest
+FROM golang:1.9.2
MAINTAINER Alex Peters <info@alexanderpeters.de>
RUN apt-get update && apt-get install -y apt-transport-https ca-certificates jq
diff --git a/docker/Dockerfile.grafana b/docker/Dockerfile.grafana
index debed49..d8b2cbf 100755
--- a/docker/Dockerfile.grafana
+++ b/docker/Dockerfile.grafana
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM kamon/grafana_graphite
+FROM kamon/grafana_graphite:3.0
MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
diff --git a/docker/Dockerfile.registrator b/docker/Dockerfile.registrator
index fe261a3..219cc4d 100644
--- a/docker/Dockerfile.registrator
+++ b/docker/Dockerfile.registrator
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM gliderlabs/registrator:master
+FROM gliderlabs/registrator:v7
#FROM registrator:dev
#ENTRYPOINT ["/bin/registrator"]
diff --git a/envoy/go/golang-builder/Dockerfile b/envoy/go/golang-builder/Dockerfile
index 1673daa..47765fe 100644
--- a/envoy/go/golang-builder/Dockerfile
+++ b/envoy/go/golang-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:latest
+FROM golang:1.9.2
MAINTAINER Alex Peters <info@alexanderpeters.de>
RUN apt-get update && apt-get install -y apt-transport-https ca-certificates jq
diff --git a/install/cleanup.sh b/install/cleanup.sh
index f18d4e4..17996d8 100755
--- a/install/cleanup.sh
+++ b/install/cleanup.sh
@@ -20,4 +20,3 @@
git checkout ../voltha/voltha.yml
git checkout ../ofagent/ofagent.yml
git checkout ../netconf/netconf.yml
-popd
diff --git a/portainer/buildPortainer.sh b/portainer/buildPortainer.sh
index dc0b002..57c503f 100755
--- a/portainer/buildPortainer.sh
+++ b/portainer/buildPortainer.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-docker run -d --name pbuild -p 9999:9000 portainer/portainer
+docker run -d --name pbuild -p 9999:9000 portainer/portainer:1.15.2
rm -fr tmp_portainer
mkdir tmp_portainer
docker cp pbuild:/ tmp_portainer