Skip to content

Commit 45699c8

Browse files
committed
ci: unnecessary buildcache image removed & set gh as a default image source for gateway & server installs
1 parent 5b23297 commit 45699c8

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/docker-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
platforms: linux/amd64,linux/arm64
8181
tags: ${{ steps.meta.outputs.tags }}
8282
labels: ${{ steps.meta.outputs.labels }}
83-
cache-from: type=registry,ref=ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/wireport:buildcache
84-
cache-to: type=registry,ref=ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/wireport:buildcache,mode=max
83+
cache-from: type=gha
84+
cache-to: type=gha,mode=max
8585
build-args: |
8686
BUILDKIT_INLINE_CACHE=1

app/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ GO_MODULE := wireport
1010
ARCHS := amd64 arm64
1111
OSES := linux darwin windows
1212
PACKAGE ?= unknown
13+
DOCKER_IMAGE ?= ghcr.io/multionlabs/wireport
1314

1415
# Package metadata
1516
PKG_DESCRIPTION := wireport - ingress proxy and VPN tunnel
@@ -176,7 +177,7 @@ build-pkgs: build-macos-pkg build-macos-zip build-windows-zip build-deb-docker b
176177

177178
docker-build-push:
178179
@echo "Building and pushing Docker image..."
179-
docker buildx build --platform=linux/amd64,linux/arm64 -t anybotsllc/wireport:$(VERSION) . && docker push anybotsllc/wireport:$(VERSION)
180+
docker buildx build --platform=linux/amd64,linux/arm64 -t $(DOCKER_IMAGE):$(VERSION) . && docker push $(DOCKER_IMAGE):$(VERSION)
180181

181182
clean:
182183
@echo "Cleaning build artifacts..."

app/cmd/server/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ var Config = &Configuration{
125125
CoreDNSRestartCommand: "/bin/kill -9 $(pidof coredns)", // with actual restart (not -HUP) - to drop the cache
126126

127127
WireportGatewayContainerName: "wireport-gateway",
128-
WireportGatewayContainerImage: "anybotsllc/wireport",
128+
WireportGatewayContainerImage: "ghcr.io/multionlabs/wireport",
129129
WireportServerContainerName: "wireport-server",
130-
WireportServerContainerImage: "anybotsllc/wireport",
130+
WireportServerContainerImage: "ghcr.io/multionlabs/wireport",
131131

132132
CertExpiry: time.Hour * 24 * 365 * 5, // 5 years
133133
}

0 commit comments

Comments
 (0)