From: charleswrayjr Date: Thu, 4 Sep 2025 06:45:05 +0000 (-0500) Subject: Fixing scripts. X-Git-Url: https://git.phasecustomsoft.com/static/gitweb.css?a=commitdiff_plain;h=f5370d83e27b5cfe42488b16370aeee68bc239a0;p=phs-stack.git Fixing scripts. --- diff --git a/.gitignore b/.gitignore index 765f033..e8538b9 100644 --- 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 657e3c5..c36308f 100644 --- a/.idea/phs-stack.iml +++ b/.idea/phs-stack.iml @@ -3,6 +3,7 @@ + diff --git a/docker-compose.yml b/docker-compose.yml index aa1e3b0..3b08189 100644 --- 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 186554d..806079d 100755 --- 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 c6d3ec0..7384c0d 100755 --- 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