Progress on server version

Author: fileformat

.air.toml

@@ -2,17 +2,17 @@ root = "."
 tmp_dir = "tmp"
 
 [build]
-  bin = "./tmp/fflint-online --bind=localhost"
-  cmd = "go build -o ./tmp/fflint-online ./cmd/online/main.go"
+  bin = "./tmp/fflint-server --bind=localhost"
+  cmd = "go build -o ./tmp/fflint-server ./cmd/server/main.go"
   delay = 1000
-  exclude_dir = ["assets", "tmp", "vendor"]
+  exclude_dir = ["tmp"]
   exclude_file = []
   exclude_regex = []
   exclude_unchanged = false
   follow_symlink = false
   full_bin = ""
   include_dir = []
-  include_ext = ["go", "tpl", "tmpl", "html"]
+  include_ext = ["go", "tmpl", "html"]
   kill_delay = "0s"
   log = "build-errors.log"
   send_interrupt = false

.github/workflows/gcr-deploy.yaml

@@ -32,7 +32,7 @@ jobs:
 
       # Setup gcloud CLI
       - name: gcloud setup
-        uses: google-github-actions/setup-gcloud@v1
+        uses: google-github-actions/setup-gcloud@v2
 
       - name: gcloud docker-auth
         run: gcloud auth configure-docker
@@ -43,8 +43,6 @@ jobs:
           docker build \
             --build-arg COMMIT=${GITHUB_SHA:0:7} \
             --build-arg LASTMOD=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
-            --build-arg BUILTBY=github-actions \
-            --build-arg VERSION=${GITHUB_REF_NAME} \
             --tag gcr.io/${RUN_PROJECT}/${RUN_SERVICE}:$GITHUB_SHA \
             .
 

Dockerfile

@@ -1,33 +1,26 @@
 # syntax=docker/dockerfile:1
-FROM golang:1.18-alpine as builder
+FROM golang:1.23-alpine AS builder
 RUN apk update && \
     apk upgrade && \
     apk --no-cache add git
+
 RUN mkdir /build
 ADD . /build/
 WORKDIR /build
 ARG COMMIT
 ARG LASTMOD
 ARG VERSION
-ARG BUILTBY
 RUN echo "INFO: building for $COMMIT on $LASTMOD"
 RUN \
     CGO_ENABLED=0 GOOS=linux go build \
     -a \
     -installsuffix cgo \
-    -ldflags "-X main.commit=$COMMIT -X main.date=$LASTMOD -X main.version=$VERSION -X main.builtBy=$BUILTBY -extldflags '-static'" \
-    -o fflint-online cmd/online/main.go
-
-RUN \
-    CGO_ENABLED=0 GOOS=linux go build \
-    -a \
-    -installsuffix cgo \
-    -ldflags "-X main.commit=$COMMIT -X main.date=$LASTMOD -X main.version=$VERSION -X main.builtBy=$BUILTBY -extldflags '-static'" \
-    -o fflint cmd/fflint/main.go
+    -ldflags "-X internal.server.COMMIT=$COMMIT -X internal.server.LASTMOD=$LASTMOD -extldflags '-static'" \
+    -o fflint-server cmd/server/main.go
 
 FROM scratch
-COPY --from=builder /build/fflint /app/
-COPY --from=builder /build/fflint-online /app/
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /build/fflint-server /app/
 WORKDIR /app
 ENV PORT 4000
-ENTRYPOINT ["./fflint-online"]
+ENTRYPOINT ["./fflint-server"]