Skip to content

Commit cbac3b9

Browse files
authored
Merge branch 'develop' into fix/pgbouncer-ownership
2 parents 754b920 + daf1236 commit cbac3b9

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

Dockerfile-15

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ WORKDIR /nixpg
6767

6868
RUN nix profile install .#psql_15/bin
6969

70+
RUN nix store gc
7071

7172

7273
WORKDIR /

Dockerfile-kubernetes

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

33
ADD ./output-cloudimg/packer-cloudimg /disk/focal.qcow2
44

5-
RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client nftables cloud-utils-localds aavmf
5+
RUN apk add --no-cache qemu-system-aarch64 qemu-img openssh-client nftables cloud-utils-localds aavmf virtiofsd
66
# dev stuff
77
# RUN apk add --no-cache iproute2
88

Dockerfile-orioledb-17

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ WORKDIR /nixpg
6868

6969
RUN nix profile install .#psql_orioledb-17/bin
7070

71-
71+
RUN nix store gc
7272

7373
WORKDIR /
7474

flake.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
# pull them from the overlays/ directory automatically, but we don't
3939
# want to have an arbitrary order, since it might matter. being
4040
# explicit is better.
41+
(final: prev: {
42+
xmrig = throw "The xmrig package has been explicitly disabled in this flake.";
43+
})
4144
(import rust-overlay)
4245
(final: prev: {
4346
cargo-pgrx = final.callPackage ./nix/cargo-pgrx/default.nix {

0 commit comments

Comments
 (0)