Compare commits
2 commits
647d12efbd
...
ad48295484
| Author | SHA1 | Date | |
|---|---|---|---|
| ad48295484 | |||
| e3c1748d6a |
3 changed files with 24 additions and 5 deletions
22
.forgejo/workflows/deploy.yml
Normal file
22
.forgejo/workflows/deploy.yml
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
name: Deploy via SSH
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest # Make sure you have a runner with this label
|
||||||
|
steps:
|
||||||
|
- name: Deploy to Server
|
||||||
|
uses: appleboy/ssh-action@v1.0.3
|
||||||
|
with:
|
||||||
|
host: ${{ secrets.SSH_HOST }}
|
||||||
|
username: ${{ secrets.SSH_USER }}
|
||||||
|
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
|
port: 22 # or 8022 based on your previous scp command
|
||||||
|
script: |
|
||||||
|
cd ~/Git/tracker
|
||||||
|
git pull origin main
|
||||||
|
docker compose up -d --build
|
||||||
2
app.py
2
app.py
|
|
@ -190,7 +190,7 @@ with col2:
|
||||||
|
|
||||||
# Reindex to ensure we cover from START_DATE to Today (or Max Date)
|
# Reindex to ensure we cover from START_DATE to Today (or Max Date)
|
||||||
# This ensures weeks with 0 work are counted in the average
|
# This ensures weeks with 0 work are counted in the average
|
||||||
max_date = max(df['date'].max(), pd.Timestamp.now())
|
max_date = pd.Timestamp.now() if df.empty or pd.isna(df['date'].max()) else max(df['date'].max(), pd.Timestamp.now())
|
||||||
full_weeks = pd.date_range(start=START_DATE, end=max_date, freq='W-MON')
|
full_weeks = pd.date_range(start=START_DATE, end=max_date, freq='W-MON')
|
||||||
weekly_data = weekly_data.reindex(full_weeks, fill_value=0)
|
weekly_data = weekly_data.reindex(full_weeks, fill_value=0)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,5 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- DB_FILE=/data/work_log.db
|
- DB_FILE=/data/work_log.db
|
||||||
volumes:
|
volumes:
|
||||||
- tracker_data:/data
|
- ./:/data
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
|
||||||
tracker_data:
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue