diff --git a/.gitignore b/.gitignore index 41c6aff..4b35be5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,8 @@ output.css compose.yaml tailwindcss .env +node_modules +package.json +package-lock.json +cpu.pprof +main diff --git a/Dockerfile b/Dockerfile index 4ed0a2f..eee5168 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.23-alpine as build_go -RUN apk add --no-cache curl +RUN apk add --no-cache curl npm WORKDIR /app @@ -9,11 +9,11 @@ RUN go mod download COPY . . RUN go install github.com/a-h/templ/cmd/templ@latest -RUN curl -sL https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 -o tailwindcss -RUN chmod +x tailwindcss +RUN npm install tailwindcss @tailwindcss/cli RUN templ generate -RUN ./tailwindcss -i cmd/web/assets/css/input.css -o cmd/web/assets/css/output.css +RUN npx @tailwindcss/cli -i ./cmd/web/assets/css/input.css -o ./cmd/web/assets/css/output.css + RUN go build -o main cmd/main.go # Stage 2, distribution container diff --git a/cmd/web/assets/css/input.css b/cmd/web/assets/css/input.css index 4c719af..2af16a4 100644 --- a/cmd/web/assets/css/input.css +++ b/cmd/web/assets/css/input.css @@ -1,6 +1,4 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import "tailwindcss"; #search-container { text-align: center; diff --git a/justfile b/justfile index 95aa4f0..32e1b7e 100644 --- a/justfile +++ b/justfile @@ -18,6 +18,10 @@ templ-install: fi; \ fi +templ-build: templ-install + @echo "Building templ..." + @templ generate + tailwind-macos: @if [ ! -f tailwindcss ]; then curl -sL https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-macos-arm64 -o tailwindcss; fi @chmod +x tailwindcss @@ -26,17 +30,19 @@ tailwind-linux: @if [ ! -f tailwindcss ]; then curl -sL https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 -o tailwindcss; fi @chmod +x tailwindcss +tailwind-build: + @echo "Building tailwind..." + @./tailwindcss -i cmd/web/assets/css/input.css -o cmd/web/assets/css/output.css + sqlc-generate: + @echo "Generating sqlc schema..." @sqlc generate migrate-create name: @migrate create -ext sql -dir internal/db/migrations -seq {{name}} -build: +build: sqlc-generate templ-build tailwind-build @echo "Building..." - @sqlc generate - @templ generate - @./tailwindcss -i cmd/web/assets/css/input.css -o cmd/web/assets/css/output.css @swag init -d ./cmd/,./internal/backend/ -o ./cmd/docs @go build -o main cmd/main.go @@ -53,6 +59,12 @@ clean: @echo "Cleaning..." @rm -f main +podman-run: + @podman-compose up --build + +podman-down: + @podman-compose down + # Create DB container docker-run: @if docker compose up --build 2>/dev/null; then \