update version to 0.5

HDFGroup · Oct 15, 2019 · 2732360 · 2732360
1 parent deafd29
commit 2732360
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/build.sh b/build.sh
@@ -9,8 +9,8 @@ if [ $# -gt 0 ]; then
         echo "no pyflakes"
         run_pyflakes=
     fi
-fi 
-  
+fi
+
 if [ $run_pyflakes ]; then
     echo "running pyflakes on hsds"
     if [ $(./pyflakes.sh -count hsds) -ge 1 ]; then
@@ -28,7 +28,7 @@ if [ $run_pyflakes ]; then
 fi
 
 echo "clean stopped containers"
-docker rm -v $(docker ps -aq -f status=exited) 
+docker rm -v $(docker ps -aq -f status=exited)
 
 echo "building docker image"
-docker-compose build  
+docker build -t hdfgroup/hsds .
diff --git a/docker-compose.secure.yml b/docker-compose.secure.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   head:
-    build: .
+    image: hdfgroup/hsds
     container_name: hsds_head
     restart: ${RESTART_POLICY}
     mem_limit: ${HEAD_RAM}
@@ -26,7 +26,7 @@ services:
     - proxy
 
   dn:
-    build: .
+    image: hdfgroup/hsds
     restart: ${RESTART_POLICY}
     mem_limit: ${DN_RAM}
     environment:
@@ -48,7 +48,7 @@ services:
     depends_on:
       - head
   sn:
-    build: .
+    image: hdfgroup/hsds
     restart: ${RESTART_POLICY}
     mem_limit: ${SN_RAM}
     environment:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   head:
-    build: .
+    image: hdfgroup/hsds
     container_name: hsds_head
     restart: ${RESTART_POLICY}
     mem_limit: ${HEAD_RAM}
@@ -28,7 +28,7 @@ services:
       - proxy
 
   dn:
-    build: .
+    image: hdfgroup/hsds
     restart: ${RESTART_POLICY}
     mem_limit: ${DN_RAM}
     environment:
@@ -44,7 +44,7 @@ services:
       - LOG_LEVEL=${LOG_LEVEL}
       - CHUNK_MEM_CACHE_SIZE=${CHUNK_MEM_CACHE_SIZE}
       - MAX_CHUNK_SIZE=${MAX_CHUNK_SIZE}
-  
+
     ports:
       - ${DN_PORT}
     logging:
@@ -54,7 +54,7 @@ services:
     depends_on:
       - head
   sn:
-    build: .
+    image: hdfgroup/hsds
     restart: ${RESTART_POLICY}
     mem_limit: ${SN_RAM}
     environment:
@@ -80,7 +80,7 @@ services:
       - PASSWORD_SALT=${PASSWORD_SALT}
       - GREETING=${GREETING}
       - ABOUT=${ABOUT}
-    
+
     ports:
       - ${SN_PORT}
     logging:

diff --git a/docs/docker_install.rst b/docs/docker_install.rst
@@ -12,7 +12,7 @@ Export environment variables as shown in "Sample .bashrc" below.
 5. Copy the file "passwd.default" to "passwd.txt".  Add any usernames/passwords you wish
 6. Add the DNS for the service to the /etc/hosts file.  E.g. `127.0.0.1  hsds.hdf.test` (can use any valid DNS name) if you running containers directly on the host, or `192.168.99.100  hsds.hdf.test` if using docker machine (use `docker-machine ip` to get the IP address)
 7. Create enviroment variables as in "Sample .bashrc" below
-8. From hsds directory, build docker image:  `$ docker-compose build`
+8. From hsds directory, build docker image:  `$ docker build -t hdfgroup/hsds .`
 9. Start the service `$./runall.sh <n>` where n is the number of containers desired (defaults to 1)
 10. Run `$ docker ps` and verify that the containers are running: hsds_head, hsds_async, hsds_sn_[1-n], hsds_dn_[1-n]
 11. Go to http://hsds.hdf.test/about and verify that "cluster_state" is "READY" (might need to give it a minute or two)

diff --git a/hsds/basenode.py b/hsds/basenode.py
@@ -33,7 +33,7 @@
 from kubernetes import client as k8s_client
 from kubernetes import config as k8s_config
 
-HSDS_VERSION = "0.4"
+HSDS_VERSION = "0.5"
 
 def getVersion():
     return HSDS_VERSION

diff --git a/k8s_deployment.yml b/k8s_deployment.yml
@@ -1,39 +1,39 @@
 apiVersion: apps/v1
 kind: Deployment
-metadata: 
-  labels: 
+metadata:
+  labels:
     app: hsds
   name: hsds
-spec: 
+spec:
   replicas: 1
-  selector: 
-    matchLabels: 
+  selector:
+    matchLabels:
       app: hsds
-  template: 
-    metadata: 
-      labels: 
+  template:
+    metadata:
+      labels:
         app: hsds
-    spec: 
-      containers: 
-        - 
+    spec:
+      containers:
+        -
           name: sn
           image: "hsds"
           imagePullPolicy: Never
-          ports: 
-            - 
+          ports:
+            -
               containerPort: 5101
           env:
           - name: NODE_TYPE
             value: sn
           - name: AWS_S3_GATEWAY
             value: http://s3.amazonaws.com
-          - name: AWS_ACCESS_KEY_ID 
-            valueFrom: 
+          - name: AWS_ACCESS_KEY_ID
+            valueFrom:
               secretKeyRef:
                 name: aws-auth-keys
                 key: aws_access_key_id
           - name: AWS_SECRET_ACCESS_KEY
-            valueFrom: 
+            valueFrom:
               secretKeyRef:
                 name: aws-auth-keys
                 key: aws_secret_access_key
@@ -51,25 +51,25 @@ spec:
             value: "Welcome to HSDS!"
           - name: ABOUT
             value: "HSDS is a webservice for HDF data"
-        - 
+        -
           name: dn
           image: "hsds"
-          imagePullPolicy: Never 
-          ports: 
-            - 
+          imagePullPolicy: Never
+          ports:
+            -
               containerPort: 6101
           env:
           - name: NODE_TYPE
             value: dn
           - name: AWS_S3_GATEWAY
             value: http://s3.amazonaws.com
-          - name: AWS_ACCESS_KEY_ID 
-            valueFrom: 
+          - name: AWS_ACCESS_KEY_ID
+            valueFrom:
               secretKeyRef:
                 name: aws-auth-keys
                 key: aws_access_key_id
           - name: AWS_SECRET_ACCESS_KEY
-            valueFrom: 
+            valueFrom:
               secretKeyRef:
                 name: aws-auth-keys
                 key: aws_secret_access_key