Skip to content
This repository has been archived by the owner on Apr 23, 2024. It is now read-only.

Commit

Permalink
Merge pull request #299 from mgilangjanuar/staging
Browse files Browse the repository at this point in the history
Release v2.0.5
  • Loading branch information
mgilangjanuar authored Mar 31, 2022
2 parents 359990c + 718132f commit 4aa93a7
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 25 deletions.
30 changes: 12 additions & 18 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
version: '3'

services:
traefik:
image: traefik:v2.6
command:
- --log.level=INFO
- --api.insecure=true
- --entrypoints.web.address=:80
- --providers.docker
volumes:
- /var/run/docker.sock:/var/run/docker.sock
labels:
traefik.http.routers.dash.rule: Host(`dash.localhost`)
traefik.http.routers.dash.service: api@internal
ports:
- "80:80"
depends_on:
- app
app:
teledrive:
command: node server/dist/index.js
labels:
traefik.http.routers.server.rule: Host(`teledrive.localhost`)
Expand All @@ -37,10 +21,12 @@ services:
DB_HOST: db
DB_USERNAME: postgres
DB_PASSWORD: ${DB_PASSWORD}
REDIS_URI: redis://redis:6379
env_file:
- .env
depends_on:
- db

db:
image: postgres:13
restart: always
Expand All @@ -49,4 +35,12 @@ services:
POSTGRES_PASSWORD: ${DB_PASSWORD}
POSTGRES_DB: teledrive
volumes:
- ../server/src/model/migrations/dump.sql:/docker-entrypoint-initdb.d/dump.sql
- teledrive_data:/var/lib/postgresql/data
- ../server/src/model/migrations/dump.sql:/docker-entrypoint-initdb.d/dump.sql

redis:
image: redis:6
restart: always

volumes:
teledrive_data:
8 changes: 5 additions & 3 deletions docs/docs/Installation/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ cd docker
docker-compose up -d
```

Done! You can now open [teledrive.localhost](http://teledrive.localhost) or [localhost:4000](http://localhost:4000) in your browser 🎊
Done! You can now open [localhost:4000](http://localhost:4000) in your browser 🎊

View the app logs with this command:

```shell
cd docker
docker-compose logs app --follow
docker-compose logs teledrive --follow
```

**Note.** *You need to set `ENV=develop` in the variables to logging all events.*
Expand All @@ -66,7 +66,9 @@ Upgrade to the latest version of TeleDrive with this command:
git pull origin main # or, staging for the latest updates
cd docker
docker-compose up -d --build app
docker-compose down
docker-compose build teledrive
docker-compose up -d
```

## Common Issues
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "teledrive",
"version": "2.0.4",
"version": "2.0.5",
"repository": "[email protected]:mgilangjanuar/teledrive.git",
"author": "M Gilang Januar <[email protected]>",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "server",
"version": "2.0.4",
"version": "2.0.5",
"main": "dist/index.js",
"license": "MIT",
"private": true,
Expand Down
3 changes: 3 additions & 0 deletions server/src/service/Cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ export class Redis {
if (!this.client) {
this.client = new Redis()
}
this.client.redis?.on('connect', () => console.log('redis: connected'))
this.client.redis?.on('ready', () => console.log('redis: ready'))
this.client.redis?.on('error', console.error)
return this.client
}

Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web",
"version": "2.0.4",
"version": "2.0.5",
"private": true,
"dependencies": {
"@ideasio/add-to-homescreen-react": "^1.0.10",
Expand Down
2 changes: 1 addition & 1 deletion web/src/utils/Constant.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const VERSION = '2.0.4'
export const VERSION = '2.0.5'
export const MAX_UPLOAD_SIZE = 2_000_000_000
export const CHUNK_SIZE = 512 * 1024
export const RETRY_COUNT = 50

0 comments on commit 4aa93a7

Please sign in to comment.