Skip to content

Commit b6e8c85

Browse files
authored
Merge pull request #15 from fluxcd/fluxcd/pkg/runtime-v0.8.5
Update fluxcd/pkg/runtime to v0.8.5
2 parents b8019f5 + 138cd7f commit b6e8c85

File tree

3 files changed

+21
-56
lines changed

3 files changed

+21
-56
lines changed

Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@ COPY controllers/ controllers/
1616
# build
1717
RUN CGO_ENABLED=0 go build -a -o source-watcher main.go
1818

19-
FROM alpine:3.12
19+
FROM alpine:3.13
2020

2121
RUN apk add --no-cache ca-certificates tini
2222

2323
COPY --from=builder /workspace/source-watcher /usr/local/bin/
2424

25-
RUN addgroup -S controller && adduser -S -g controller controller
25+
# Create minimal nsswitch.conf file to prioritize the usage of /etc/hosts over DNS queries.
26+
# https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-354316460
27+
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
28+
29+
RUN addgroup -S controller && adduser -S controller -G controller
2630

2731
USER controller
2832

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ module github.com/fluxcd/source-watcher
33
go 1.15
44

55
require (
6-
github.com/fluxcd/pkg/runtime v0.8.1
6+
github.com/fluxcd/pkg/runtime v0.8.5
77
github.com/fluxcd/pkg/untar v0.0.5
8-
github.com/fluxcd/source-controller/api v0.8.0
8+
github.com/fluxcd/source-controller/api v0.9.1
99
github.com/go-logr/logr v0.3.0
1010
github.com/spf13/pflag v1.0.5
1111
k8s.io/apimachinery v0.20.2
1212
k8s.io/client-go v0.20.2
13-
sigs.k8s.io/controller-runtime v0.8.0
13+
sigs.k8s.io/controller-runtime v0.8.3
1414
)

0 commit comments

Comments
 (0)