Skip to content

Commit 670f927

Browse files
committed
Merge branch 'fix/docker-cli-apk-pin' into 'master'
fix(engine): loosen docker-cli apk pin to survive -rN rebuilds Closes #717 See merge request postgres-ai/database-lab!1152
2 parents 9d7b768 + 727bd6d commit 670f927

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

engine/Dockerfile.ci-checker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.23@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a50
22

33
# Install dependencies.
44
RUN apk upgrade --no-cache \
5-
&& apk add --no-cache bash docker-cli=29.1.3-r4
5+
&& apk add --no-cache bash 'docker-cli~29'
66

77
WORKDIR /home/dblab
88

engine/Dockerfile.dblab-cli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM alpine:3.23@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a50
22

33
# Install dependencies.
44
RUN apk upgrade --no-cache \
5-
&& apk add --no-cache bash docker-cli=29.1.3-r4 jq tzdata
5+
&& apk add --no-cache bash 'docker-cli~29' jq tzdata
66

77
WORKDIR /home/dblab
88
COPY ./bin/dblab ./bin/dblab

engine/Dockerfile.dblab-server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM alpine:3.23@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a50
44

55
# Install dependencies
66
RUN apk upgrade --no-cache \
7-
&& apk add --no-cache docker-cli=29.1.3-r4 zfs lvm2 bash util-linux tzdata
7+
&& apk add --no-cache 'docker-cli~29' zfs lvm2 bash util-linux tzdata
88

99
WORKDIR /home/dblab
1010

engine/Dockerfile.dblab-server-debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ FROM alpine:3.23@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a50
1818
# edge-repo zfs=2.1.4-r0 pin and `--ignore zfs` upgrade workaround are no
1919
# longer needed because alpine:3.23 ships a usable stable zfs package.
2020
RUN apk upgrade --no-cache \
21-
&& apk add --no-cache docker-cli=29.1.3-r4 zfs lvm2 bash util-linux tzdata
21+
&& apk add --no-cache 'docker-cli~29' zfs lvm2 bash util-linux tzdata
2222

2323
WORKDIR /home/dblab
2424

0 commit comments

Comments
 (0)