mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-21 13:23:07 +01:00
Code Issues Projects Releases Wiki Activity

fix: fixes broken versions. fixes #3087. (#3084)

Browse Source
This commit is contained in:
Amir Raminfar
2024-07-10 08:52:54 -07:00
committed by GitHub
parent c4b5c1c193
commit d82e00e877
6 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/deploy.yml vendored
View File

@@ -88,11 +88,6 @@ jobs:
name: Release name: Release
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: amir20/dozzle
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0 uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
- name: Login to DockerHub - name: Login to DockerHub
@@ -102,6 +97,11 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: amir20/dozzle
- name: Writing certs to file - name: Writing certs to file
run: | run: |
echo "${{ secrets.TTL_KEY }}" > shared_key.pem echo "${{ secrets.TTL_KEY }}" > shared_key.pem

10
.github/workflows/dev.yml vendored
View File

@@ -12,11 +12,6 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ !github.event.repository.fork && !github.event.pull_request.head.repo.fork && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'amir20/dozzle') }} if: ${{ !github.event.repository.fork && !github.event.pull_request.head.repo.fork && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'amir20/dozzle') }}
steps: steps:
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: amir20/dozzle
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0 uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
- name: Login to DockerHub - name: Login to DockerHub
@@ -26,6 +21,11 @@ jobs:
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: amir20/dozzle
- name: Writing certs to file - name: Writing certs to file
run: | run: |
echo "${{ secrets.TTL_KEY }}" > shared_key.pem echo "${{ secrets.TTL_KEY }}" > shared_key.pem

2
Dockerfile
View File

@@ -53,7 +53,7 @@ ARG TARGETOS TARGETARCH
RUN go generate RUN go generate
# Build binary # Build binary
RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags "-s -w -X cli.version=$TAG" -o dozzle RUN GOOS=$TARGETOS GOARCH=$TARGETARCH CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=$TAG" -o dozzle
RUN mkdir /data RUN mkdir /data

4
Makefile
View File

@@ -26,11 +26,11 @@ test: fake_assets generate
.PHONY: build .PHONY: build
build: dist generate build: dist generate
CGO_ENABLED=0 go build -ldflags "-s -w" CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/amir20/dozzle/internal/support/cli.Version=local"
.PHONY: docker .PHONY: docker
docker: shared_key.pem shared_cert.pem docker: shared_key.pem shared_cert.pem
@docker build -t amir20/dozzle . @docker build --build-arg TAG=local -t amir20/dozzle .
generate: shared_key.pem shared_cert.pem $(GEN_FILES) generate: shared_key.pem shared_cert.pem $(GEN_FILES)

6
internal/support/cli/args.go
View File

@@ -6,9 +6,7 @@ import (
"github.com/alexflint/go-arg" "github.com/alexflint/go-arg"
) )
var ( var Version = "head"
version = "head"
)
type Args struct { type Args struct {
Addr string `arg:"env:DOZZLE_ADDR" default:":8080" help:"sets host:port to bind for server. This is rarely needed inside a docker container."` Addr string `arg:"env:DOZZLE_ADDR" default:":8080" help:"sets host:port to bind for server. This is rarely needed inside a docker container."`
@@ -46,7 +44,7 @@ type GenerateCmd struct {
} }
func (Args) Version() string { func (Args) Version() string {
return version return Version
} }
func ParseArgs() (Args, interface{}) { func ParseArgs() (Args, interface{}) {

4
internal/support/cli/clients.go
View File

@@ -52,12 +52,12 @@ func CreateMultiHostService(embededCerts embed.FS, args Args) *docker_support.Mu
if err != nil { if err != nil {
log.Debugf("could not connect to local Docker Engine: %s", err) log.Debugf("could not connect to local Docker Engine: %s", err)
if !args.NoAnalytics { if !args.NoAnalytics {
go StartEvent(version, args.Mode, args.RemoteAgent, args.RemoteHost, nil, "") go StartEvent(args.Version(), args.Mode, args.RemoteAgent, args.RemoteHost, nil, "")
} }
} else { } else {
log.Debugf("connected to local Docker Engine") log.Debugf("connected to local Docker Engine")
if !args.NoAnalytics { if !args.NoAnalytics {
go StartEvent(version, args.Mode, args.RemoteAgent, args.RemoteHost, localClient, "") go StartEvent(args.Version(), args.Mode, args.RemoteAgent, args.RemoteHost, localClient, "")
} }
clients = append(clients, docker_support.NewDockerClientService(localClient)) clients = append(clients, docker_support.NewDockerClientService(localClient))
} }