Skip to content

Commit

Permalink
Merge pull request #6 from bybatkhuu/develop
Browse files Browse the repository at this point in the history
✏️ Minor updates.
  • Loading branch information
bybatkhuu authored Nov 28, 2023
2 parents fbee873 + 731b048 commit 50a989a
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 13 deletions.
1 change: 1 addition & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ changelog:
- title: 👷 CI/CD
labels:
- ci
- cicd
- ci/cd
- build
- deploy
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "volumes/src/fastapi-orm-template"]
path = volumes/src/fastapi-orm-template
[submodule "volumes/src/rest.fastapi-orm-template"]
path = volumes/src/rest.fastapi-orm-template
url = ../rest.fastapi-orm-template.git
6 changes: 2 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
"**/*.log": true,
"**/*.out": true,
"**/*.bak": true,
"**/.bak.*": true,
"**/.DS_Store": true,
"**/Thumbs.db": true
},
Expand Down Expand Up @@ -124,15 +123,14 @@
"**/*.log": true,
"**/*.out": true,
"**/*.bak": true,
"**/.bak.*": true,
"**/.DS_Store": true,
"**/Thumbs.db": true
},
"git-graph.maxDepthOfRepoSearch": 4,
"python.languageServer": "Pylance",
"python.analysis.extraPaths":
[
"${workspaceFolder}/volumes/src/fastapi-orm-template/app"
// "${workspaceFolder}/volumes/src/fastapi-orm-template/app/src/modules"
"${workspaceFolder}/volumes/src/rest.fastapi-orm-template/app"
// "${workspaceFolder}/volumes/src/rest.fastapi-orm-template/app/src/modules"
]
}
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
tty: true

api:
image: bybatkhuu/fastapi-orm-template:1.0.2-231128
image: bybatkhuu/fastapi-orm-template:1.0.3-231128
depends_on:
- db
restart: unless-stopped
Expand Down
4 changes: 2 additions & 2 deletions templates/docker-compose/docker-compose.override.dev.gpu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ services:
volumes:
- "./volumes/storage/fastapi-orm-template/logs:${FOT_APP_LOGS_DIR:-/var/log/fastapi-orm-template}"
- "./volumes/storage/fastapi-orm-template/data:${FOT_APP_DATA_DIR:-/var/lib/fastapi-orm-template}"
- "./volumes/src/fastapi-orm-template/scripts/docker/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh"
- "./volumes/src/fastapi-orm-template/app:/app/fastapi-orm-template"
- "./volumes/src/rest.fastapi-orm-template/scripts/docker/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh"
- "./volumes/src/rest.fastapi-orm-template/app:/app/fastapi-orm-template"
- "./volumes/.vscode-server:/home/fot-user/.vscode-server"
# deploy:
# replicas: 0
Expand Down
4 changes: 2 additions & 2 deletions templates/docker-compose/docker-compose.override.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ services:
volumes:
- "./volumes/storage/fastapi-orm-template/logs:${FOT_APP_LOGS_DIR:-/var/log/fastapi-orm-template}"
- "./volumes/storage/fastapi-orm-template/data:${FOT_APP_DATA_DIR:-/var/lib/fastapi-orm-template}"
- "./volumes/src/fastapi-orm-template/scripts/docker/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh"
- "./volumes/src/fastapi-orm-template/app:/app/fastapi-orm-template"
- "./volumes/src/rest.fastapi-orm-template/scripts/docker/docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh"
- "./volumes/src/rest.fastapi-orm-template/app:/app/fastapi-orm-template"
- "./volumes/.vscode-server:/home/fot-user/.vscode-server"
# deploy:
# replicas: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
# - "${PGADMIN_PORT:-8080}:80"

api:
image: bybatkhuu/fastapi-orm-template:1.0.2-231128-gpu
image: bybatkhuu/fastapi-orm-template:1.0.3-231128-gpu
runtime: nvidia
env_file:
- .env
Expand Down
1 change: 0 additions & 1 deletion volumes/src/fastapi-orm-template
Submodule fastapi-orm-template deleted from cb986c
1 change: 1 addition & 0 deletions volumes/src/rest.fastapi-orm-template

0 comments on commit 50a989a

Please sign in to comment.