Skip to content

Commit

Permalink
Update readme & run migrations on docker
Browse files Browse the repository at this point in the history
  • Loading branch information
Konstantinos Sideris committed Mar 1, 2021
1 parent d045852 commit f8351b5
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 1 deletion.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Features

- API endpoint & UI controls to attach tags to projects. (e.g "work", "web", "ui")
- Ability to filter statistics by tag.
- Ability to filter statistics by tag and view their aggregated statistics.

## Improvements

- Reduced the amount of api calls made by the UI.
- The docker image will apply the database migration on boot.

## Bug fixes

Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ COPY --from=dashboard-builder /usr/src/app/dist /app/bin/dashboard
COPY --from=server-builder /app/bin/hakatime /app/bin/hakatime
COPY docker/init.sql /app/init.sql
COPY docker/start.sh /app/start.sh
COPY migrations/ /app/migrations

RUN apk add --no-cache \
bash \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.arm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ COPY --from=dashboard-builder /usr/src/app/dist /app/bin/dashboard
COPY --from=server-builder /app/bin/hakatime /app/bin/hakatime
COPY docker/init.sql /app/init.sql
COPY docker/start.sh /app/start.sh
COPY migrations/ /app/migrations

ENV HAKA_PORT 8080
ENV HAKA_DASHBOARD_PATH /app/bin/dashboard
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ It comes together with a dashboard which provides a graphical representation of
## Features

- Import Wakatime activity using an API token and a range of dates.
- Group projects together with tags (e.g `#work`, `#personal`) and view their aggregated statistics.
- User registration & login through the UI.
- Badge generation for a project that displays that total amount of hours spent for a configurable
time period. [![my-app](https://hakatime-demo.mtx-dev.xyz/badge/svg/f8c0f834-3747-4d3f-965b-6fa08c6dea94?days=14)](https://hakatime-demo.mtx-dev.xyz/badge/svg/f8c0f834-3747-4d3f-965b-6fa08c6dea94?days=7)
Expand Down
2 changes: 2 additions & 0 deletions docker/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ else
echo "Database ${HAKA_DB_NAME} initialized"
fi

/app/bin/hakatime run-migrations -d /app/migrations

echo "Starting hakatime server ..."

/app/bin/hakatime run
Expand Down

0 comments on commit f8351b5

Please sign in to comment.