update dockerfile to run for dev or prod (#32)

.github/workflows/fly-deploy.yml

@@ -7,7 +7,7 @@ on:
       - main
 jobs:
   deploy:
-    if: false # disable...
+    # if: false # disable...
     name: Deploy app
     runs-on: ubuntu-latest
     concurrency: deploy-group

Dockerfile

@@ -1,15 +1,35 @@
-FROM golang:alpine
+FROM golang:1.23.2-alpine AS builder
 
-RUN apk update && apk add --no-cache git && apk add --no-cach bash && apk add build-base
-
-RUN mkdir /app
 WORKDIR /app
 
+COPY go.mod go.sum ./
+RUN go mod download
+
 COPY . .
 
-RUN go install github.com/air-verse/air@latest
-RUN go mod download
+RUN go build -o bin/piccolo ./cmd/piccolo
+
+FROM golang:1.23.2-alpine AS runner
+
+WORKDIR /root/
+
+COPY . .
+COPY --from=builder /app/bin/piccolo .
+
+ARG ENV=production
+ENV ENV=$ENV
+
+RUN if [ "$ENV" = "local" ]; then \
+      go mod download; \
+      go install github.com/air-verse/air@latest; \
+    else \
+      go build --o bin/piccolo ./cmd/piccolo; \
+    fi
 
-EXPOSE 8000
+EXPOSE 8001
 
-CMD [ "make", "run" ]
+CMD if [ "$ENV" = "local" ]; then \
+      air; \
+    else \
+      ./piccolo; \
+    fi

Makefile

@@ -1,14 +1,20 @@
 include .env
 
 build:
-	go build --o bin/piccolo cmd/piccolo/main.go
+	go build --o bin/piccolo cmd/piccolo
+
+docker_build_local:
+	docker build --build-arg ENV=local -t piccolo-app .
 
 lint:
 	go vet ./...
 
-run:
+start_watch:
 	air
 
+start:
+	./bin/piccolo
+
 pg_schema:
 	docker compose exec postgres pg_dump -U $(DB_USER) --exclude-table-data=schema_migrations --schema-only $(DB_NAME) > db/schema.sql
 

docker-compose.yml

@@ -8,14 +8,19 @@ services:
       - DATABASE_HOST=${DB_HOST}
       - DATABASE_PORT=${DB_PORT}
     tty: true
-    build: .
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        ENV: ${ENV}
     ports:
       - 8001:8001
     restart: on-failure
     volumes:
       - .:/app
     depends_on:
       - postgres
+      - redis
 
   postgres:
     image: postgres:latest