.dockerignore

@@ -1 +0,0 @@
-src/web/static/*

Dockerfile

@@ -6,11 +6,10 @@ RUN npm install && \
 
 FROM python:3.10.9-alpine
 
-ENV VERSION_NUMBER 0.1.1-8-gf7b69f7
+ENV VERSION_NUMBER 0.1.1-3-gd029fda
 ENV PROD 1
 
 RUN apk add \
-    bash \
     vim \
     curl \
     caddy

Makefile

@@ -1,3 +1,5 @@
+.PHONY: createsuperuser shell cleanstatic
+
 all: css migrate
 
 initialize: npm css migrate sethookdir loadplatforms
@@ -22,11 +24,8 @@ migrate: makemigrations
 dev: migrate sethookdir
 	poetry run python src/web/manage.py runserver_plus
 
-caddy:
-	caddy run --watch
-
 dev-prod: migrate collectstatic sethookdir
-	cd src/web/; PROD=1 poetry run python -m gunicorn --bind 0.0.0.0:8001 web.asgi:application -k uvicorn.workers.UvicornWorker
+	cd src/web/; poetry run python -m gunicorn --bind 0.0.0.0:8001 web.asgi:application -k uvicorn.workers.UvicornWorker
 
 dumptracker:
 	poetry run python src/web/manage.py dumpdata --format yaml tracker --output tracker_fixture.yaml
@@ -61,4 +60,4 @@ date:
 cleanstatic:
 	rm -r src/web/static/*
 
-clean: cleanstatic
+clean: cleanstatic

docker-compose.yml

@@ -1,10 +1,9 @@
 ---
+version: "2.1"
 services:
   timetracker:
     image: registry.kucharczyk.xyz/timetracker
-    build:
+    build: Dockerfile
-      context: .
-      dockerfile: Dockerfile
     container_name: timetracker
     environment:
       - TZ=Europe/Prague

entrypoint.sh

@@ -8,6 +8,6 @@ echo "Collect static files"
 poetry run python src/web/manage.py collectstatic
 
 echo "Starting server"
-caddy start
+caddy run
 cd src/web || exit
 poetry run python -m gunicorn --bind 0.0.0.0:8001 web.asgi:application -k uvicorn.workers.UvicornWorker

src/web/web/urls.py

@@ -16,13 +16,10 @@ Including another URLconf
 from django.contrib import admin
 from django.urls import include, path
 from django.views.generic import RedirectView
-from django.conf import settings
 
 
 urlpatterns = [
+    path("admin/", admin.site.urls),
     path("", RedirectView.as_view(url="/tracker/list-sessions")),
     path("tracker/", include("tracker.urls")),
 ]
-
-if settings.DEBUG:
-    urlpatterns.append(path("admin/", admin.site.urls))