Skip to content

Commit

Permalink
Outsmart go-makefile-maker
Browse files Browse the repository at this point in the history
  • Loading branch information
SuperSandro2000 committed Jan 4, 2024
1 parent 2bd6f06 commit 911f22e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ RUN addgroup -g 4200 appgroup \
# upgrade all installed packages to fix potential CVEs in advance
# also remove apk package manager to hopefully remove dependecy on openssl 🤞
RUN apk upgrade --no-cache --no-progress \
&& apk add --no-cache --no-progress ca-certificates postgresql12-client postgresql15-client curl jq \
&& apk add --no-cache --no-progress ca-certificates postgresql15-client curl jq \
&& apk add --no-cache --no-progress --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/community postgresql12-client \
&& apk del --no-cache --no-progress apk-tools alpine-keys

COPY --from=builder /pkg/ /usr/
Expand Down
4 changes: 3 additions & 1 deletion Makefile.maker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ dockerfile:
- "ENV ENV=/usr/bin/motd.sh" # `kubectl exec` is not a login shell, so we need to use this instead of /etc/profile or $HOME/.profile
extraPackages:
# for psql, pg_dump
- postgresql12-client
- postgresql15-client
# required for backup-tools.sh
- curl
- jq
- "\\
\ \ && apk add --no-cache --no-progress --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/community postgresql12-client"

golang:
enableVendoring: true
Expand Down

0 comments on commit 911f22e

Please sign in to comment.