Fix r3.1 dockerfile (#507)

* fix copy bitcode destination

* add execute generate_upgrades before install

* add ENV PLV8_VERSION and PLV8_BRANCH

platforms/Docker/bullseye/14.5/Dockerfile

@@ -1,22 +1,27 @@
 FROM postgres:14.5-bullseye as builder
 
+ENV PLV8_VERSION=3.1.4
+ENV PLV8_BRANCH=r3.1
 RUN set -ex \
   && apt-get update \
-  && apt-get install -y build-essential curl python3 ninja-build git wget postgresql-server-dev-14 libtinfo5 pkg-config clang binutils \
+  && apt-get install -y build-essential curl python3 ninja-build git wget postgresql-server-dev-${PG_MAJOR} libtinfo5 pkg-config clang binutils \
   && git clone https://github.com/plv8/plv8 \
   && cd plv8 \
-  && git checkout r3.1 \
+  && git checkout ${PLV8_BRANCH} \
+  && make DOCKER=1 generate_upgrades \
   && make DOCKER=1 install \
-  && strip /usr/lib/postgresql/14/lib/plv8-3.1.4.so
+  && strip /usr/lib/postgresql/${PG_MAJOR}/lib/plv8-${PLV8_VERSION}.so
 
 
 FROM postgres:14.5-bullseye
 
-COPY --from=builder /usr/lib/postgresql/14/lib/plv8* /usr/lib/postgresql/14/lib/
-COPY --from=builder /usr/share/postgresql/14/extension/plv8* /usr/share/postgresql/14/extension/
-COPY --from=builder /usr/share/postgresql/14/extension/plls* /usr/share/postgresql/14/extension/
-COPY --from=builder /usr/share/postgresql/14/extension/plcoffee* /usr/share/postgresql/14/extension/
-COPY --from=builder /usr/lib/postgresql/14/lib/bitcode/plv8* /usr/lib/postgresql/14/bitcode/
+ENV PLV8_VERSION=3.1.4
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/plv8* /usr/lib/postgresql/${PG_MAJOR}/lib/
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/plv8-${PLV8_VERSION}.index.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/plv8-${PLV8_VERSION}/* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/plv8-${PLV8_VERSION}/
+COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/plv8* /usr/share/postgresql/${PG_MAJOR}/extension/
+COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/plls* /usr/share/postgresql/${PG_MAJOR}/extension/
+COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/plcoffee* /usr/share/postgresql/${PG_MAJOR}/extension/
 
 
 RUN mkdir -p /var/log/postgres \