File tree Expand file tree Collapse file tree 7 files changed +1
-64
lines changed
Expand file tree Collapse file tree 7 files changed +1
-64
lines changed Original file line number Diff line number Diff line change @@ -110,18 +110,6 @@ RUN apt-get update && \
110110
111111ENV PGDATA=/var/lib/postgresql/data
112112
113- ####################
114- # setup-wal-g.yml
115- ####################
116- FROM base as walg
117- ARG wal_g_release
118- WORKDIR /nixpg
119-
120- RUN nix profile install .#wal-g-3 && \
121- ln -s /nix/var/nix/profiles/default/bin/wal-g-3 /tmp/wal-g
122-
123- RUN nix store gc
124-
125113WORKDIR /
126114####################
127115# setup-groonga
@@ -166,7 +154,6 @@ RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $GOSU_GPG_KEY &&
166154FROM gosu as production
167155RUN id postgres || (echo "postgres user does not exist" && exit 1)
168156# # Setup extensions
169- COPY --from=walg /tmp/wal-g /usr/local/bin/
170157COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
171158
172159# # Initialise configs
Original file line number Diff line number Diff line change @@ -114,19 +114,6 @@ RUN apt-get update && \
114114
115115ENV PGDATA=/var/lib/postgresql/data
116116
117- ####################
118- # setup-wal-g.yml
119- ####################
120- FROM base as walg
121- ARG wal_g_release
122-
123- WORKDIR /nixpg
124-
125- RUN nix profile install .#wal-g-3 && \
126- ln -s /nix/var/nix/profiles/default/bin/wal-g-3 /tmp/wal-g
127-
128- RUN nix store gc
129-
130117WORKDIR /
131118####################
132119# setup-groonga
@@ -171,7 +158,6 @@ RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $GOSU_GPG_KEY &&
171158FROM gosu as production
172159RUN id postgres || (echo "postgres user does not exist" && exit 1)
173160# # Setup extensions
174- COPY --from=walg /tmp/wal-g /usr/local/bin/
175161COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
176162
177163# # Initialise configs
Original file line number Diff line number Diff line change @@ -114,19 +114,6 @@ RUN apt-get update && \
114114
115115ENV PGDATA=/var/lib/postgresql/data
116116
117- ####################
118- # setup-wal-g.yml
119- ####################
120- FROM base as walg
121- ARG wal_g_release
122-
123- WORKDIR /nixpg
124-
125- RUN nix profile install .#wal-g-3 && \
126- ln -s /nix/var/nix/profiles/default/bin/wal-g-3 /tmp/wal-g
127-
128- RUN nix store gc
129-
130117WORKDIR /
131118####################
132119# setup-groonga
@@ -171,7 +158,6 @@ RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $GOSU_GPG_KEY &&
171158FROM gosu as production
172159RUN id postgres || (echo "postgres user does not exist" && exit 1)
173160# # Setup extensions
174- COPY --from=walg /tmp/wal-g /usr/local/bin/
175161COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
176162
177163# # Initialise configs
Original file line number Diff line number Diff line change 3333 cmd : sudo -u wal-g bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#wal-g-2"
3434 become : true
3535
36- - name : Install wal-g 3 from nix binary cache
37- ansible.builtin.shell :
38- cmd : sudo -u wal-g bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#wal-g-3"
39- become : true
40-
41- - name : Create symlink for wal-g-3 from Nix profile to /usr/local/bin
42- ansible.builtin.file :
43- dest : ' /usr/local/bin/wal-g-v3'
44- force : true
45- src : ' /home/wal-g/.nix-profile/bin/wal-g-3'
46- state : ' link'
47- become : true
48-
4936 - name : Create symlink to make wal-g-v2 the default wal-g
5037 ansible.builtin.file :
5138 dest : ' /usr/local/bin/wal-g'
Original file line number Diff line number Diff line change 394394 ) ;
395395 inherit ( self' . packages )
396396 wal-g-2
397- wal-g-3
398397 dbmate-tool
399398 packer
400399 pg_regress
Original file line number Diff line number Diff line change 6868 sync-exts-versions = pkgs . callPackage ./sync-exts-versions.nix { inherit ( inputs' ) nix-editor ; } ;
6969 trigger-nix-build = pkgs . callPackage ./trigger-nix-build.nix { } ;
7070 update-readme = pkgs . callPackage ./update-readme.nix { } ;
71- inherit ( pkgs . callPackage ./wal-g.nix { } ) wal-g-2 wal-g-3 ;
71+ inherit ( pkgs . callPackage ./wal-g.nix { } ) wal-g-2 ;
7272 inherit ( pkgs . cargo-pgrx )
7373 cargo-pgrx_0_11_3
7474 cargo-pgrx_0_12_6
Original file line number Diff line number Diff line change 7777 vendorHash = "sha256-BbQuY6r30AkxlCZjY8JizaOrqEBdv7rIQet9KQwYB/g=" ;
7878 majorVersion = "2" ;
7979 } ;
80-
81- # wal-g v3.0.5
82- wal-g-3 = walGCommon {
83- version = "3.0.5" ;
84- sha256 = "sha256-wVr0L2ZXMuEo6tc2ajNzPinVQ8ZVzNOSoaHZ4oFsA+U=" ;
85- vendorHash = "sha256-YDLAmRfDl9TgbabXj/1rxVQ052NZDg3IagXVTe5i9dw=" ;
86- majorVersion = "3" ;
87- } ;
8880}
You can’t perform that action at this time.
0 commit comments