Merge branch 'main' of https://github.com/SSAFY-TOTT/TOTT

SSAFY-TOTT · Sep 11, 2023 · df65e44 · df65e44
2 parents 0b8dbed + af3cd31
commit df65e44
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/Android b/Android
diff --git a/deploy.sh b/deploy.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Installing docker engine if not exists
+if ! type docker > /dev/null
+then
+  echo "docker does not exist"
+  echo "Start installing docker"
+  sudo apt-get update
+  sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
+  curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"
+  sudo apt update
+  apt-cache policy docker-ce
+  sudo apt install -y docker-ce
+fi
+
+# Installing docker-compose if not exists
+if ! type docker-compose > /dev/null
+then
+  echo "docker-compose does not exist"
+  echo "Start installing docker-compose"
+  sudo curl -L "https://github.com/docker/compose/releases/download/1.27.3/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+  sudo chmod +x /usr/local/bin/docker-compose
+fi
+
+echo "start submoudle update"
+cd /home/ubuntu/srv/ubuntu
+mkdir alertmanager
+sudo git submodule init
+sudo git submodule update --recursive --remote --merge
+# sudo mv /home/ubuntu/srv/ubuntu/.env /home/ubuntu/srv/ubuntu/backend/
+# echo "start docker-compose up: ubuntu"
+# sudo docker-compose -f /home/ubuntu/srv/ubuntu/docker-compose.yml up --build -d
+0 −2		app/src/main/java/com/ssafy/tott/di/ApiService.kt
+30 −7		app/src/main/java/com/ssafy/tott/ui/buildingdetail/BuildingDetailActivity.kt
+25 −2		app/src/main/java/com/ssafy/tott/ui/houselist/BuildingDetailListAdapter.kt
+0 −25		app/src/main/java/com/ssafy/tott/ui/houselist/BuildingDetailViewHolder.kt
+20 −5		app/src/main/java/com/ssafy/tott/ui/map/SearchMapActivity.kt
+16 −9		app/src/main/java/com/ssafy/tott/ui/map/SimpleHouseListDialogFragment.kt
+17 −1		app/src/main/java/com/ssafy/tott/ui/model/BuildingDetailUI.kt
+10 −0		app/src/main/java/com/ssafy/tott/ui/util/ImageLoader.kt
+11 −0		app/src/main/java/com/ssafy/tott/ui/util/SerializeGetter.kt
+16 −0		app/src/main/java/com/ssafy/tott/ui/util/SerializeMapper.kt