mirrors/homebox
1
0
Fork 1
mirror of https://github.com/hay-kot/homebox.git synced 2024-12-19 05:26:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix build injection

Browse source
This commit is contained in:
Hayden 2022-10-13 17:01:01 -08:00
parent 84bf67079b
commit 1279028d07
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/partial-publish.yaml vendored
View file

@ -60,6 +60,7 @@ jobs:
--tag ghcr.io/hay-kot/homebox:nightly \ --tag ghcr.io/hay-kot/homebox:nightly \
--tag ghcr.io/hay-kot/homebox:latest \ --tag ghcr.io/hay-kot/homebox:latest \
--tag ghcr.io/hay-kot/homebox:${{ inputs.tag }} \ --tag ghcr.io/hay-kot/homebox:${{ inputs.tag }} \
--build-arg VERSION=${{ inputs.tag }} \
--build-arg COMMIT=$(git rev-parse HEAD) \ --build-arg COMMIT=$(git rev-parse HEAD) \
--build-arg BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ --build-arg BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--platform linux/amd64,linux/arm64,linux/arm/v7 . --platform linux/amd64,linux/arm64,linux/arm/v7 .

3
Dockerfile
View file

@ -12,6 +12,7 @@ RUN pnpm build
FROM golang:alpine AS builder FROM golang:alpine AS builder
ARG BUILD_TIME ARG BUILD_TIME
ARG COMMIT ARG COMMIT
ARG VERSION
RUN apk update && \ RUN apk update && \
apk upgrade && \ apk upgrade && \
apk add --update git build-base gcc g++ apk add --update git build-base gcc g++
@ -22,7 +23,7 @@ RUN go get -d -v ./...
RUN rm -rf ./app/api/public RUN rm -rf ./app/api/public
COPY --from=frontend-builder /app/.output/public ./app/api/public COPY --from=frontend-builder /app/.output/public ./app/api/public
RUN CGO_ENABLED=1 GOOS=linux go build \ RUN CGO_ENABLED=1 GOOS=linux go build \
-ldflags "-s -w -X main.Commit=$COMMIT -X main.BuildTime=$BUILD_TIME" \ -ldflags "-s -w -X main.commit=$COMMIT -X main.buildTime=$BUILD_TIME -X main.version=$VERSION" \
-o /go/bin/api \ -o /go/bin/api \
-v ./app/api/*.go -v ./app/api/*.go

6
backend/app/api/main.go
View file

@ -20,9 +20,9 @@ import (
) )
var ( var (
Version = "0.1.0" version = "nightly"
Commit = "HEAD" commit = "HEAD"
BuildTime = "now" buildTime = "now"
) )
// @title Go API Templates // @title Go API Templates

6
backend/app/api/routes.go
View file

@ -47,9 +47,9 @@ func (a *app) newRouter(repos *repo.AllRepos) *chi.Mux {
v1.WithDemoStatus(a.conf.Demo), // Disable Password Change in Demo Mode v1.WithDemoStatus(a.conf.Demo), // Disable Password Change in Demo Mode
) )
r.Get(v1Base("/status"), v1Ctrl.HandleBase(func() bool { return true }, v1.Build{ r.Get(v1Base("/status"), v1Ctrl.HandleBase(func() bool { return true }, v1.Build{
Version: Version, Version: version,
Commit: Commit, Commit: commit,
BuildTime: BuildTime, BuildTime: buildTime,
})) }))
r.Post(v1Base("/users/register"), v1Ctrl.HandleUserRegistration()) r.Post(v1Base("/users/register"), v1Ctrl.HandleUserRegistration())