hpz937/zurg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build params

Browse Source
This commit is contained in:
Ben Sarmiento
2023-12-09 01:22:17 +01:00
parent 2281b58b59
commit 50086dc0e3
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/build.yml vendored
View File

@@ -14,10 +14,6 @@ jobs:
packages: write packages: write
steps: steps:
- name: Set version
id: version
run: echo "::set-output name=version::$(echo ${GITHUB_REF#refs/tags/})"
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v4 uses: actions/setup-go@v4
with: with:
@@ -29,8 +25,8 @@ jobs:
- name: Generate build variables - name: Generate build variables
id: prep id: prep
run: | run: |
echo "version=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT
echo "built_at=$(date +%Y-%m-%dT%H:%M:%S)" >> $GITHUB_OUTPUT echo "built_at=$(date +%Y-%m-%dT%H:%M:%S)" >> $GITHUB_OUTPUT
echo "go_version=$(go version | cut -d ' ' -f 3)" >> $GITHUB_OUTPUT
echo "git_commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT echo "git_commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
- name: Cross-compile with xgo - name: Cross-compile with xgo
@@ -48,10 +44,9 @@ jobs:
race: false race: false
ldflags: > ldflags: >
-s -w -s -w
-X 'github.com/debridmediamanager/zurg/internal.BuiltAt=${{ steps.prep.outputs.built_at }}' -X 'github.com/debridmediamanager/zurg/internal/version.BuiltAt=${{ steps.prep.outputs.built_at }}'
-X 'github.com/debridmediamanager/zurg/internal.GoVersion=${{ steps.prep.outputs.go_version }}' -X 'github.com/debridmediamanager/zurg/internal/version.GitCommit=${{ steps.prep.outputs.git_commit }}'
-X 'github.com/debridmediamanager/zurg/internal.GitCommit=${{ steps.prep.outputs.git_commit }}' -X 'github.com/debridmediamanager/zurg/internal/version.Version=${{ steps.prep.outputs.version }}'
-X 'github.com/debridmediamanager/zurg/internal.Version=${{ steps.version.outputs.version }}'
buildmode: default buildmode: default
trimpath: true trimpath: true
@@ -69,10 +64,9 @@ jobs:
race: false race: false
ldflags: > ldflags: >
-s -w -s -w
-X 'github.com/debridmediamanager/zurg/internal.BuiltAt=${{ steps.prep.outputs.built_at }}' -X 'github.com/debridmediamanager/zurg/internal/version.BuiltAt=${{ steps.prep.outputs.built_at }}'
-X 'github.com/debridmediamanager/zurg/internal.GoVersion=${{ steps.prep.outputs.go_version }}' -X 'github.com/debridmediamanager/zurg/internal/version.GitCommit=${{ steps.prep.outputs.git_commit }}'
-X 'github.com/debridmediamanager/zurg/internal.GitCommit=${{ steps.prep.outputs.git_commit }}' -X 'github.com/debridmediamanager/zurg/internal/version.Version=${{ steps.version.outputs.version }}'
-X 'github.com/debridmediamanager/zurg/internal.Version=${{ steps.version.outputs.version }}'
buildmode: default buildmode: default
trimpath: true trimpath: true

3
.github/workflows/build_docker.yml vendored
View File

@@ -19,7 +19,6 @@ jobs:
run: | run: |
echo "version=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT echo "version=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT
echo "built_at=$(date +%Y-%m-%dT%H:%M:%S)" >> $GITHUB_OUTPUT echo "built_at=$(date +%Y-%m-%dT%H:%M:%S)" >> $GITHUB_OUTPUT
echo "go_version=$(go version | cut -d ' ' -f 3)" >> $GITHUB_OUTPUT
echo "git_commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT echo "git_commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
- name: Set up QEMU - name: Set up QEMU
@@ -64,7 +63,6 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache
build-args: | build-args: |
BuiltAt=${{ steps.buildvars.outputs.built_at }} BuiltAt=${{ steps.buildvars.outputs.built_at }}
GoVersion=${{ steps.buildvars.outputs.go_version }}
GitCommit=${{ steps.buildvars.outputs.git_commit }} GitCommit=${{ steps.buildvars.outputs.git_commit }}
Version=${{ steps.buildvars.outputs.version }} Version=${{ steps.buildvars.outputs.version }}
@@ -89,6 +87,5 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache
build-args: | build-args: |
BuiltAt=${{ steps.buildvars.outputs.built_at }} BuiltAt=${{ steps.buildvars.outputs.built_at }}
GoVersion=${{ steps.buildvars.outputs.go_version }}
GitCommit=${{ steps.buildvars.outputs.git_commit }} GitCommit=${{ steps.buildvars.outputs.git_commit }}
Version=${{ steps.buildvars.outputs.version }} Version=${{ steps.buildvars.outputs.version }}

3
Dockerfile
View File

@@ -2,13 +2,12 @@ FROM golang:1-alpine AS builder
ARG GOOS=linux ARG GOOS=linux
ARG GOARCH=amd64 ARG GOARCH=amd64
ARG BuiltAt ARG BuiltAt
ARG GoVersion
ARG GitCommit ARG GitCommit
ARG Version ARG Version
WORKDIR /app WORKDIR /app
COPY . . COPY . .
RUN apk add --no-cache bash git go gcc musl-dev curl fuse RUN apk add --no-cache bash git go gcc musl-dev curl fuse
RUN go build -ldflags "-s -w -X 'github.com/debridmediamanager/zurg/internal.BuiltAt=$BuiltAt' -X 'github.com/debridmediamanager/zurg/internal.GoVersion=$GoVersion' -X 'github.com/debridmediamanager/zurg/internal.GitCommit=$GitCommit' -X 'github.com/debridmediamanager/zurg/internal.Version=$Version'" -o zurg ./cmd/zurg RUN go build -ldflags "-s -w -X 'github.com/debridmediamanager/zurg/internal/version.BuiltAt=$BuiltAt' -X 'github.com/debridmediamanager/zurg/internal/version.GitCommit=$GitCommit' -X 'github.com/debridmediamanager/zurg/internal/version.Version=$Version'" -o zurg ./cmd/zurg
# Obfuscation stage # Obfuscation stage
FROM alpine:3 AS obfuscator FROM alpine:3 AS obfuscator