opentsdb+nginx: Docker_TAG is now passed to the Dockerfiles to assure…

… building the correct version Signed-off-by: Marcel Wagner <[email protected]>
wagmarcel · Jul 2, 2019 · a722caf · a722caf
1 parent c980672
commit a722caf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -126,8 +126,9 @@ services:
     build:
       context: ./oisp-frontend/public-interface/nginx
       args:
-        - WEBSOCKET_SERVER=websocket-server:5000
-        - DASHBOARD_SERVER=frontend:4001
+        - WEBSOCKET_SERVER=${WEBSOCKET_SERVER}
+        - DASHBOARD_SERVER=${FRONTEND}
+        - DOCKER_TAG=${DOCKER_TAG}
       labels:
         - oisp=true
         - oisp.git_commit=${GIT_COMMIT_FRONTEND}
@@ -277,6 +278,8 @@ services:
     image: oisp/opentsdb:${DOCKER_TAG}
     build:
       context: ./docker-opentsdb
+      args:
+        - DOCKER_TAG=${DOCKER_TAG}
       labels:
         - oisp=true
         - ois.git_commit=${GIT_COMMIT_OPENTSDB}

diff --git a/docker-opentsdb/Dockerfile b/docker-opentsdb/Dockerfile
@@ -12,8 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-FROM oisp/hbase:latest
+ARG DOCKER_TAG
+FROM oisp/hbase:${DOCKER_TAG}
 
 # avoid debconf and initrd
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/setup-environment.example.sh b/setup-environment.example.sh
@@ -40,11 +40,12 @@ export KAFKA_PORT='9092'
 export KAFKA_HEARTBEAT_TOPIC='heartbeat'
 GEARPUMP='gearpump:8090'
 BACKEND='backend:8080'
-FRONTEND='frontend:4001'
+export FRONTEND='frontend:4001'
 NGINX='nginx'
 NGINX_PORT='443'
 REDIS='redis'
 REDIS_PORT='6379'
+export WEBSOCKET_SERVER="websocket-server:5000"
 
 OPENTSDB_URI='opentsdb'
 OPENTSDB_PORT=4242