Fix conflicts

This commit is contained in:
sigonasr2 2021-11-18 17:46:50 -06:00
commit 8eb1e136c4
3 changed files with 1008 additions and 179 deletions

1169
init2.sql

File diff suppressed because it is too large Load Diff

View File

@ -6,10 +6,21 @@ touch server/.env.twitter
touch frontend/.env touch frontend/.env
cp -r ../ngsplanner_backend/* server2 cp -r ../ngsplanner_backend/* server2
cp init.sql init2.sql cp init.sql init2.sql
echo "" >> init2.sql
echo "\c postgres">>init2.sql
echo "" >> init2.sql
echo "create table password(password text);" >> init2.sql
echo "insert into password(password) values('admin')" >> init2.sql
echo "" >> init2.sql
echo "create database ngsplanner2;">>init2.sql echo "create database ngsplanner2;">>init2.sql
echo "create database ngsplanner;">>init2.sql
echo "\c ngsplanner2">>init2.sql echo "\c ngsplanner2">>init2.sql
cat ../ngsplanner_backend/ngsplanner_schema.sql>>init2.sql cat ../ngsplanner_backend/ngsplanner_schema.sql>>init2.sql
cat ../ngsplanner_backend/ngsplanner_seed.sql>>init2.sql cat ../ngsplanner_backend/ngsplanner_seed.sql>>init2.sql
echo "" >> init2.sql
echo "\c ngsplanner">>init2.sql
cat ../ngsplanner_backend/ngsplanner_schema.sql>>init2.sql
cat ../ngsplanner_backend/ngsplanner_seed.sql>>init2.sql
echo REACT_APP_GITPOD_WORKSPACE_URL=$GITPOD_WORKSPACE_URL/ngsplanner >> ../ngsplanner/.env echo REACT_APP_GITPOD_WORKSPACE_URL=$GITPOD_WORKSPACE_URL/ngsplanner >> ../ngsplanner/.env
sed -i 's/https:\/\//https:\/\/4501-/g' ../ngsplanner/.env sed -i 's/https:\/\//https:\/\/4501-/g' ../ngsplanner/.env
docker-compose up -d docker-compose up -d

7
start Executable file
View File

@ -0,0 +1,7 @@
cd /workspace/projectdivar
docker-compose down
docker-compose up -d
cd ../ngsplanner
npm install
npm start
cd /workspace/projectdivar