Skip to content

Commit 43a329a

Browse files
fix: path correction for ENTRYPOINT (#46)
use `/usr/local/bin` everywhere
1 parent ca026d0 commit 43a329a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ FROM alpine:3.15
2828
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
2929

3030
COPY --from=lib-builder /root/dns-aaaa-no-more/getaddrinfo.so /dns-aaaa-no-more/
31-
COPY --from=app-builder /s3proxy/s3proxy /usr/bin/
32-
RUN chmod +x /usr/bin/s3proxy
31+
COPY --from=app-builder /s3proxy/s3proxy /usr/local/bin/
32+
RUN chmod +x /usr/local/bin/s3proxy
3333

3434
EXPOSE 8080
3535

@@ -38,4 +38,4 @@ USER nobody
3838
# To fix DNS issues in K8S caused by conntrack race condition (A/AAAA sent in parallel):
3939
# - cgo resolver is enforced (see https://golang.org/pkg/net/#hdr-Name_Resolution)
4040
# - getaddrinfo() C function called by cgo resolver is hooked to a new one not sending AAAA DNS requests
41-
ENTRYPOINT GODEBUG=netdns=cgo LD_PRELOAD=/dns-aaaa-no-more/getaddrinfo.so exec /bin/s3proxy
41+
ENTRYPOINT GODEBUG=netdns=cgo LD_PRELOAD=/dns-aaaa-no-more/getaddrinfo.so exec /usr/local/bin/s3proxy

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ NAME = s3proxy
22
REMOTE_NAME = ${REGISTRY}${NAME}
33

44
GOPATH ?= ${HOME}/go
5-
VERSION ?= 1.4.2
5+
VERSION ?= 1.4.2-1
66

77
LDFLAGS=-ldflags "-X main.version=${VERSION}"
88

0 commit comments

Comments
 (0)