Skip to content

Commit bbec5db

Browse files
authored
Merge pull request #105 from fluxcd/alpine-3.13
Update Alpine to v3.13
2 parents fa6e4ba + 1e48cd3 commit bbec5db

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ COPY controllers/ controllers/
2929
# Build
3030
RUN CGO_ENABLED=1 go build -o image-automation-controller main.go
3131

32-
FROM alpine:3.12
32+
FROM alpine:3.13
3333

3434
LABEL org.opencontainers.image.source="https://github.com/fluxcd/image-automation-controller"
3535

@@ -45,7 +45,7 @@ COPY --from=builder /workspace/image-automation-controller /usr/local/bin/
4545
# https://github.com/gliderlabs/docker-alpine/issues/367#issuecomment-354316460
4646
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
4747

48-
RUN addgroup -S controller && adduser -S -g controller controller
48+
RUN addgroup -S controller && adduser -S controller -G controller
4949

5050
USER controller
5151

config/manager/deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ spec:
1818
prometheus.io/port: "8080"
1919
spec:
2020
terminationGracePeriodSeconds: 10
21+
# Required for AWS IAM Role bindings
22+
# https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts-technical-overview.html
23+
securityContext:
24+
fsGroup: 1337
2125
containers:
2226
- name: manager
2327
image: fluxcd/image-automation-controller

0 commit comments

Comments
 (0)