Skip to content

Commit d18ed3e

Browse files
authored
Merge pull request #65 from ripienaar/63.1
(#63) consistency update for the generated containers
2 parents 9604597 + eeca8a3 commit d18ed3e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Diff for: ajc/task_command.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ func (c *taskCommand) purgeAction(_ *kingpin.ParseContext) error {
269269
return err
270270
}
271271

272-
ok, err := askConfirmation(fmt.Sprintf("Really purge the Task Store of %d entries, work queue entries will not be removed", nfo.Msgs), false)
272+
ok, err := askConfirmation(fmt.Sprintf("Really purge the Task Store of %s entries, work queue entries will not be removed", humanize.Comma(int64(nfo.Msgs))), false)
273273
if err != nil || !ok {
274274
return err
275275
}

Diff for: generators/fs/godocker/Dockerfile.templ

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ RUN go mod tidy -compat=1.17 && \
1717

1818
FROM alpine:latest
1919

20-
RUN adduser -DHg "Choria Async Jobs" choria && \
20+
RUN addgroup -g 2048 asyncjobs && \
21+
adduser -u 2048 -h /home/asyncjobs -g "Choria Asynchronous Jobs" -S -D -H -G asyncjobs asyncjobs && \
2122
mkdir /lib64 && \
2223
ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 && \
2324
apk --no-cache add ca-certificates && \
@@ -27,7 +28,7 @@ COPY --from=builder /app /handler/app
2728

2829
EXPOSE 8080/tcp
2930

30-
USER choria
31+
USER asyncjobs
3132

3233
ENV XDG_CONFIG_HOME "/handler/config"
3334
ENV AJ_WORK_QUEUE "{{ .Package.WorkQueue }}"

0 commit comments

Comments
 (0)