Fixing scripts.

diff --git a/.gitignore b/.gitignore
index 765f033dccc5a2cdf9456fc452d6a49b7b3fc7b6..e8538b9b38ae64adfdc1ffb3f7ffaa6791098c04 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 volumes/
+.zencoder/
\ No newline at end of file

diff --git a/.idea/phs-stack.iml b/.idea/phs-stack.iml
index 657e3c5202e576e3c6da374bec33aab7facbe39a..c36308f9168870397c394e9bf155109761707666 100644 (file)
--- a/.idea/phs-stack.iml
+++ b/.idea/phs-stack.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/.zencoder" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/volumes" />

diff --git a/docker-compose.yml b/docker-compose.yml
index aa1e3b0a4e7c511a00b6ae1030da8d0918142e10..3b08189751c8c9590ca1ee9ffdff6acb6f28439f 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -41,43 +41,43 @@ services:
     entrypoint: sh -c "/usr/src/app/run-api.sh"
     networks:
       - phs-net
-  employee:
+  home:
     build:
       dockerfile: Dockerfile
-      context: ./volumes/phs-employee/
-    hostname: phs-employee
-    container_name: phs-employee
+      context: ./volumes/phs-home/
+    hostname: phs-home
+    container_name: phs-home
     user: node
     working_dir: "/usr/src/app"
     environment:
       - CLR_ENV=${CLR_ENV}
       - TZ=America/Chicago
     volumes:
-      - ./volumes/phs-employee:/usr/src/app
+      - ./volumes/phs-home:/usr/src/app
     ports:
       - 30007:3000
     networks:
       - phs-net
     restart: unless-stopped
-    entrypoint: sh -c "/usr/src/app/run-employee.sh"
-  admin:
-    build:
-      dockerfile: Dockerfile
-      context: ./volumes/phs-admin/
-    hostname: phs-admin
-    container_name: phs-admin
-    user: node
-    working_dir: "/usr/src/app"
-    environment:
-      - CLR_ENV=${CLR_ENV}
-      - TZ=America/Chicago
-    volumes:
-      - ./volumes/phs-admin:/usr/src/app
-    ports:
-      - 30008:3000
-    networks:
-      - phs-net
-    restart: unless-stopped
-    entrypoint: sh -c "/usr/src/app/run-admin.sh"
+    entrypoint: sh -c "/usr/src/app/run-home.sh"
+#  admin:
+#    build:
+#      dockerfile: Dockerfile
+#      context: ./volumes/phs-admin/
+#    hostname: phs-admin
+#    container_name: phs-admin
+#    user: node
+#    working_dir: "/usr/src/app"
+#    environment:
+#      - CLR_ENV=${CLR_ENV}
+#      - TZ=America/Chicago
+#    volumes:
+#      - ./volumes/phs-admin:/usr/src/app
+#    ports:
+#      - 30008:3000
+#    networks:
+#      - phs-net
+#    restart: unless-stopped
+#    entrypoint: sh -c "/usr/src/app/run-admin.sh"
 networks:
   phs-net:

diff --git a/get-latest-code.sh b/get-latest-code.sh
index 186554d56f01083121efb81cd2f5191d6b72bd43..806079d073e4505089fb560b6d4553cfc5b13873 100755 (executable)
--- a/get-latest-code.sh
+++ b/get-latest-code.sh
@@ -55,7 +55,7 @@ echo
 check_branch_and_prompt .
 check_branch_and_prompt volumes/phs-api
 #check_branch_and_prompt volumes/phs-app
-check_branch_and_prompt volumes/phs-employee
+check_branch_and_prompt volumes/phs-home
 #check_branch_and_prompt volumes/phs-customer
-check_branch_and_prompt volumes/phs-admin
+#check_branch_and_prompt volumes/phs-admin
 echo All done.
\ No newline at end of file

diff --git a/setup-volumes.sh b/setup-volumes.sh
index c6d3ec0b11fe819e0238a37948c0e84c0df1b8a4..7384c0d071c792448744e6bfb9d71c209b0f21c1 100755 (executable)
--- a/setup-volumes.sh
+++ b/setup-volumes.sh
@@ -8,6 +8,7 @@ else
    cd volumes
    echo "Created volumes folder."
    echo "Getting all code..."
-   git clone git@github.com:charleswrayjr/clr-api.git
-   git clone git@github.com:charleswrayjr/clr-employee.git
+   git clone ssh://charleswray@phasecustomsoft.com:2202 /opt/git/phs-api.git
+   git clone ssh://charleswray@phasecustomsoft.com:2202 /opt/git/phs-home.git
+#   git clone git@github.com:charleswrayjr/clr-employee.git
 fi