📝 feat: fix server dockerfile && untrack *_templ.go (#991)

GenerateNU · Jun 10, 2024 · 65f24ab · 65f24ab
1 parent f5b29e9
commit 65f24ab
Show file tree

Hide file tree

Showing 23 changed files with 90 additions and 393 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -19,20 +19,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: "1.22"
       - name: Cache Go Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
-            ${{ runner.os }}-go-
+            ${{ runner.os }}-go
       - name: Install gofumpt
         run: go install mvdan.cc/gofumpt@latest
+      - name: templ
+        run: go install github.com/a-h/templ/cmd/templ@latest && templ generate
       - name: Check code formatting
         run: |
           unformatted_files=$(gofumpt -l ./backend/)
@@ -49,13 +51,21 @@ jobs:
       pull-requests: read
       checks: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: "1.22"
-          cache: false
+      - name: Cache Go Modules
+        uses: actions/cache@v4
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go
+      - name: templ
+        run: go install github.com/a-h/templ/cmd/templ@latest && templ generate
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           version: latest
           working-directory: ./backend/
@@ -74,20 +84,20 @@ jobs:
           - 5432:5432
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: "1.22"
       - name: Cache Go Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go
       - name: Install Dependencies
-        run: cd ./backend/ && go get ./...
+        run: cd ./backend/ && go install github.com/a-h/templ/cmd/templ@latest && templ generate && go get ./...
       - name: Increase max_connections in PostgreSQL
         run: |
           CONTAINER_ID=$(docker ps --filter "publish=5432" --format "{{.ID}}")

diff --git a/.github/workflows/backend_codeql.yml b/.github/workflows/backend_codeql.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: "1.22"
       - name: Initialize CodeQL
@@ -32,7 +32,7 @@ jobs:
           queries: security-and-quality
       - name: Build
         run: |
-          cd ./backend/ && go build -o backend main.go
+          go install github.com/a-h/templ/cmd/templ@latest && templ generate && cd ./backend/ && go build -o backend main.go
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
         with:

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -19,13 +19,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: "1.22"
       - name: Cache Go Modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -49,13 +49,13 @@ jobs:
       pull-requests: read
       checks: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
           go-version: "1.22"
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           version: latest
           working-directory: ./cli/

diff --git a/.github/workflows/cli_codeql.yml b/.github/workflows/cli_codeql.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: "1.22"
       - name: Initialize CodeQL

diff --git a/.github/workflows/dashboard.yml b/.github/workflows/dashboard.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -34,9 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -54,9 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn

diff --git a/.github/workflows/frontend_lib.yml b/.github/workflows/frontend_lib.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -34,9 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -54,9 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -74,15 +74,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout current branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get new version of package.json
         id: get_new_version
         run: |
           echo "new_version=$(jq -r '.version' frontend/lib/package.json)" >> $GITHUB_OUTPUT
 
       - name: Checkout main
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: main
 

diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -34,9 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -54,9 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -34,9 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn
@@ -54,9 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: yarn

diff --git a/.gitignore b/.gitignore
@@ -1,27 +1,23 @@
-# MacOS
 .DS_Store
 
-# Cli
 sac
 
-# VSCode
 .vscode
 .trunk
 
-# Node modules
 node_modules
 
-# Environment files
 .env
 .env.dev
+.env.prod
 
-# Debug files
 backend/tests/api/__debug_*
-.env.prod
 
 frontend/mobile/ios/
 frontend/mobile/android/
 tmp/
 ios
 android
 .idea/modules.xml
+
+*_templ.go
diff --git a/backend/.dockerignore b/backend/.dockerignore
@@ -1,2 +1,4 @@
 tests/
-docs/
+docs/
+*.md
+*.templ
diff --git a/backend/Dockerfile.server b/backend/Dockerfile.server
@@ -1,15 +1,18 @@
-# syntax=docker/dockerfile:1
-
-FROM golang:1.22.2
+FROM golang:1.22-alpine as builder
 
 WORKDIR /app
+RUN apk add --no-cache make nodejs npm git
 
-COPY go.mod go.sum ./
-
-COPY *.go ./
+COPY . ./
+RUN go install github.com/a-h/templ/cmd/templ@latest
+RUN templ generate
+RUN go get ./...
+RUN go mod tidy
+RUN go mod download
+RUN go build -tags prod -o bin/sac main.go
 
-RUN CGO_ENABLED=0 GOOS=linux go build -v -o ./sac
+FROM scratch
+COPY --from=builder /app/bin/sac /sac
 
 EXPOSE 8080
-
-CMD ["/sac"]
+ENTRYPOINT [ "./sac" ]
-Original file line number
+Diff line change
@@ -1,2 +1,4 @@
     tests/
-    docs/
+    docs/
+    *.md
+    *.templ