Skip to content

Commit f1e46de

Browse files
authored
Fix compilation error on arm/v7 (pull request #46 from wollomatic/develop)
Fix compilation error on arm/v7
2 parents 6a7e23d + 70093e6 commit f1e46de

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

.github/workflows/docker-image-testing.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
with:
2323
args: ./...
2424

25-
- name: Install Cosign
26-
uses: sigstore/cosign-installer@v3.8.1
27-
with:
28-
cosign-release: 'v2.4.3'
25+
# - name: Install Cosign
26+
# uses: sigstore/cosign-installer@v3.8.1
27+
# with:
28+
# cosign-release: 'v2.4.3'
2929

3030
- name: Set up Docker Buildx
3131
uses: docker/setup-buildx-action@v3
@@ -48,7 +48,7 @@ jobs:
4848
id: build-and-push
4949
with:
5050
context: .
51-
platforms: linux/amd64,linux/arm64
51+
platforms: linux/amd64,linux/arm/v7,linux/arm64
5252
push: true
5353
build-args: VERSION=testing-${{ github.sha }}
5454
tags: |
@@ -57,14 +57,14 @@ jobs:
5757
ghcr.io/wollomatic/socket-proxy:testing
5858
ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }}
5959
60-
- name: Sign Docker Hub image
61-
run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY docker.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.build-and-push.outputs.digest }}
62-
env:
63-
COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
64-
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
65-
66-
- name: Sign GitHub Container Registry image
67-
run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.build-and-push.outputs.digest }}
68-
env:
69-
COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
70-
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
60+
# - name: Sign Docker Hub image
61+
# run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY docker.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.build-and-push.outputs.digest }}
62+
# env:
63+
# COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
64+
# COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
65+
#
66+
# - name: Sign GitHub Container Registry image
67+
# run: cosign sign --yes --recursive --key env://COSIGN_PRIVATE_KEY ghcr.io/wollomatic/socket-proxy:testing-${{ github.sha }}@${{ steps.build-and-push.outputs.digest }}
68+
# env:
69+
# COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
70+
# COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}

internal/config/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,14 @@ func InitConfig() (*Config, error) {
140140
flag.StringVar(&logLevel, "loglevel", defaultLogLevel, "set log level: DEBUG, INFO, WARN, ERROR")
141141
flag.UintVar(&proxyPort, "proxyport", defaultProxyPort, "tcp port to listen on")
142142
flag.UintVar(&cfg.ShutdownGraceTime, "shutdowngracetime", defaultShutdownGraceTime, "maximum time in seconds to wait for the server to shut down gracefully")
143-
if cfg.ShutdownGraceTime > math.MaxInt64 {
144-
return nil, fmt.Errorf("shutdowngracetime has to be smaller than %i", math.MaxInt64) // this maximum value has no practical significance
143+
if cfg.ShutdownGraceTime > math.MaxInt {
144+
return nil, fmt.Errorf("shutdowngracetime has to be smaller than %i", math.MaxInt) // this maximum value has no practical significance
145145
}
146146
flag.StringVar(&cfg.SocketPath, "socketpath", defaultSocketPath, "unix socket path to connect to")
147147
flag.BoolVar(&cfg.StopOnWatchdog, "stoponwatchdog", defaultStopOnWatchdog, "stop the program when the socket gets unavailable (otherwise log only)")
148148
flag.UintVar(&cfg.WatchdogInterval, "watchdoginterval", defaultWatchdogInterval, "watchdog interval in seconds (0 to disable)")
149-
if cfg.WatchdogInterval > math.MaxInt64 {
150-
return nil, fmt.Errorf("watchdoginterval has to be smaller than %i", math.MaxInt64) // this maximum value has no practical significance
149+
if cfg.WatchdogInterval > math.MaxInt {
150+
return nil, fmt.Errorf("watchdoginterval has to be smaller than %i", math.MaxInt) // this maximum value has no practical significance
151151
}
152152
flag.StringVar(&cfg.ProxySocketEndpoint, "proxysocketendpoint", defaultProxySocketEndpoint, "unix socket endpoint (if set, used instead of the TCP listener)")
153153
flag.UintVar(&endpointFileMode, "proxysocketendpointfilemode", defaultProxySocketEndpointFileMode, "set the file mode of the unix socket endpoint")

0 commit comments

Comments
 (0)