Updated dockerfile to make sure that it works after all changes

This commit is contained in:
2025-01-28 15:33:25 +01:00
parent d653463f58
commit 73d85adc42
4 changed files with 26 additions and 11 deletions

5
.gitignore vendored
View File

@@ -7,3 +7,8 @@ output.css
compose.yaml compose.yaml
tailwindcss tailwindcss
.env .env
node_modules
package.json
package-lock.json
cpu.pprof
main

View File

@@ -1,5 +1,5 @@
FROM golang:1.23-alpine as build_go FROM golang:1.23-alpine as build_go
RUN apk add --no-cache curl RUN apk add --no-cache curl npm
WORKDIR /app WORKDIR /app
@@ -9,11 +9,11 @@ RUN go mod download
COPY . . COPY . .
RUN go install github.com/a-h/templ/cmd/templ@latest 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 npm install tailwindcss @tailwindcss/cli
RUN chmod +x tailwindcss
RUN templ generate 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 RUN go build -o main cmd/main.go
# Stage 2, distribution container # Stage 2, distribution container

View File

@@ -1,6 +1,4 @@
@tailwind base; @import "tailwindcss";
@tailwind components;
@tailwind utilities;
#search-container { #search-container {
text-align: center; text-align: center;

View File

@@ -18,6 +18,10 @@ templ-install:
fi; \ fi; \
fi fi
templ-build: templ-install
@echo "Building templ..."
@templ generate
tailwind-macos: tailwind-macos:
@if [ ! -f tailwindcss ]; then curl -sL https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-macos-arm64 -o tailwindcss; fi @if [ ! -f tailwindcss ]; then curl -sL https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-macos-arm64 -o tailwindcss; fi
@chmod +x tailwindcss @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 @if [ ! -f tailwindcss ]; then curl -sL https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 -o tailwindcss; fi
@chmod +x tailwindcss @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: sqlc-generate:
@echo "Generating sqlc schema..."
@sqlc generate @sqlc generate
migrate-create name: migrate-create name:
@migrate create -ext sql -dir internal/db/migrations -seq {{name}} @migrate create -ext sql -dir internal/db/migrations -seq {{name}}
build: build: sqlc-generate templ-build tailwind-build
@echo "Building..." @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 @swag init -d ./cmd/,./internal/backend/ -o ./cmd/docs
@go build -o main cmd/main.go @go build -o main cmd/main.go
@@ -53,6 +59,12 @@ clean:
@echo "Cleaning..." @echo "Cleaning..."
@rm -f main @rm -f main
podman-run:
@podman-compose up --build
podman-down:
@podman-compose down
# Create DB container # Create DB container
docker-run: docker-run:
@if docker compose up --build 2>/dev/null; then \ @if docker compose up --build 2>/dev/null; then \