Add GitSHA variable
This commit is contained in:
2
.github/workflows/docker-image.yml
vendored
2
.github/workflows/docker-image.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
|||||||
echo "SLUG=ghcr.io/cwpearson/ytdlp-site" >> $GITHUB_ENV
|
echo "SLUG=ghcr.io/cwpearson/ytdlp-site" >> $GITHUB_ENV
|
||||||
echo "DATE=$(date +"%Y%m%d_%H%M")" >> $GITHUB_ENV
|
echo "DATE=$(date +"%Y%m%d_%H%M")" >> $GITHUB_ENV
|
||||||
- name: Build the Docker image
|
- name: Build the Docker image
|
||||||
run: docker build . --file Dockerfile --tag "$SLUG:$DATE" --tag "$SLUG:latest"
|
run: docker build . --file Dockerfile --build-arg GIT_SHA=$(git rev-parse HEAD) --tag "$SLUG:$DATE" --tag "$SLUG:latest"
|
||||||
- name: Publish to GHCR
|
- name: Publish to GHCR
|
||||||
run: |
|
run: |
|
||||||
echo '${{secrets.GHCR_TOKEN}}' | docker login ghcr.io -u cwpearson --password-stdin
|
echo '${{secrets.GHCR_TOKEN}}' | docker login ghcr.io -u cwpearson --password-stdin
|
||||||
|
@@ -1,4 +1,6 @@
|
|||||||
FROM golang:1.23.0-bookworm as builder
|
FROM golang:1.23.0-bookworm as builder
|
||||||
|
ARG GIT_SHA="<not provided>"
|
||||||
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends --no-install-suggests wget
|
RUN apt-get update && apt-get install -y --no-install-recommends --no-install-suggests wget
|
||||||
RUN wget https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux -O /usr/local/bin/yt-dlp \
|
RUN wget https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp_linux -O /usr/local/bin/yt-dlp \
|
||||||
@@ -8,7 +10,7 @@ ADD *.go /src/.
|
|||||||
ADD go.mod /src
|
ADD go.mod /src
|
||||||
|
|
||||||
RUN cd /src && go mod tidy
|
RUN cd /src && go mod tidy
|
||||||
RUN cd /src && go build -o server *.go
|
RUN cd /src && go build -ldflags "-X main.GitSHA=${GIT_SHA}" -o server *.go
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
|
|
||||||
|
12
config.go
12
config.go
@@ -39,3 +39,15 @@ func getSessionAuthKey() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
return []byte{}, errors.New(fmt.Sprintf("please set %s", key))
|
return []byte{}, errors.New(fmt.Sprintf("please set %s", key))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var GitSHA string
|
||||||
|
|
||||||
|
func getGitSHA() string {
|
||||||
|
|
||||||
|
if GitSHA == "" {
|
||||||
|
return "<not provided>"
|
||||||
|
} else {
|
||||||
|
return GitSHA
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
2
main.go
2
main.go
@@ -37,6 +37,8 @@ func ensureAdminAccount(db *gorm.DB) error {
|
|||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|
||||||
|
fmt.Printf("git SHA: %s\n", getGitSHA())
|
||||||
|
|
||||||
// Create config database
|
// Create config database
|
||||||
err := os.MkdirAll(getConfigDir(), 0700)
|
err := os.MkdirAll(getConfigDir(), 0700)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Reference in New Issue
Block a user