Update for BABEL_5_2_0__PG_17_5

Author: jonathanpotts

Dockerfile

@@ -1,23 +1,22 @@
 # Build stage
-FROM ubuntu:20.04
+FROM ubuntu:22.04 AS base
 
 # Specify babelfish version by using a tag from:
 # https://github.com/babelfish-for-postgresql/babelfish-for-postgresql/tags
-ARG BABELFISH_VERSION=BABEL_2_3_0__PG_14_6
+ARG BABELFISH_VERSION=BABEL_5_2_0__PG_17_5
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV BABELFISH_HOME=/opt/babelfish
 
 # Install build dependencies
 RUN apt update && apt install -y --no-install-recommends\
 	build-essential flex libxml2-dev libxml2-utils\
 	libxslt-dev libssl-dev libreadline-dev zlib1g-dev\
 	libldap2-dev libpam0g-dev gettext uuid uuid-dev\
 	cmake lld apt-utils libossp-uuid-dev gnulib bison\
-	xsltproc icu-devtools libicu66\
+	xsltproc icu-devtools libicu70\
 	libicu-dev gawk\
-	curl openjdk-8-jre openssl\
-	g++ libssl-dev python-dev libpq-dev\
+	curl openjdk-21-jre openssl\
+	g++ libssl-dev python-dev-is-python3 libpq-dev\
 	pkg-config libutfcpp-dev\
 	gnupg unixodbc-dev net-tools unzip wget
 
@@ -33,14 +32,17 @@ RUN wget ${BABELFISH_URL}/releases/download/${BABELFISH_TAG}/${BABELFISH_FILE}
 RUN tar -xvzf ${BABELFISH_FILE}
 
 # Set environment variables
+ENV JOBS=4
+ENV BABELFISH_HOME=/opt/babelfish
+ENV PG_CONFIG=${BABELFISH_HOME}/bin/pg_config
 ENV PG_SRC=/workplace/${BABELFISH_VERSION}
 
 WORKDIR ${PG_SRC}
 
 ENV PG_CONFIG=${BABELFISH_HOME}/bin/pg_config
 
 # Compile ANTLR 4
-ENV ANTLR4_VERSION=4.9.3
+ENV ANTLR4_VERSION=4.13.2
 ENV ANTLR4_JAVA_BIN=/usr/bin/java
 ENV ANTLR4_RUNTIME_LIBRARIES=/usr/include/antlr4-runtime
 ENV ANTLR_FILE=antlr-${ANTLR4_VERSION}-complete.jar
@@ -63,7 +65,7 @@ WORKDIR ${ANTLR_RUNTIME}/build
 RUN cmake .. -D\
 	ANTLR_JAR_LOCATION=${ANTLR_EXECUTABLE}\
 	-DCMAKE_INSTALL_PREFIX=/usr/local -DWITH_DEMO=True
-RUN make && make install
+RUN make -j ${JOBS} && make install
 
 # Build modified PostgreSQL for Babelfish
 WORKDIR ${PG_SRC}
@@ -80,11 +82,11 @@ RUN ./configure CFLAGS="-ggdb"\
 	--with-icu\
 	--with-openssl
 
-RUN make DESTDIR=${BABELFISH_HOME}/ 2>error.txt && make install
+RUN make DESTDIR=${BABELFISH_HOME}/ -j ${JOBS} 2>error.txt && make install
 
 WORKDIR ${PG_SRC}/contrib
 
-RUN make && make install
+RUN make -j ${JOBS} && make install
 
 # Compile the ANTLR parser generator
 RUN cp /usr/local/lib/libantlr4-runtime.so.${ANTLR4_VERSION}\
@@ -96,41 +98,41 @@ RUN make all
 
 # Compile the contrib modules and build Babelfish
 WORKDIR ${PG_SRC}/contrib/babelfishpg_common
-RUN make && make PG_CONFIG=${PG_CONFIG} install
+RUN make -j ${JOBS} && make PG_CONFIG=${PG_CONFIG} install
 
 WORKDIR ${PG_SRC}/contrib/babelfishpg_money
-RUN make && make PG_CONFIG=${PG_CONFIG} install
+RUN make -j ${JOBS} && make PG_CONFIG=${PG_CONFIG} install
 
 WORKDIR ${PG_SRC}/contrib/babelfishpg_tds
-RUN make && make PG_CONFIG=${PG_CONFIG} install
+RUN make -j ${JOBS} && make PG_CONFIG=${PG_CONFIG} install
 
 WORKDIR ${PG_SRC}/contrib/babelfishpg_tsql
-RUN make && make PG_CONFIG=${PG_CONFIG} install
+RUN make -j ${JOBS} && make PG_CONFIG=${PG_CONFIG} install
 
 # Run stage
-FROM ubuntu:20.04
+FROM base
 ENV DEBIAN_FRONTEND=noninteractive
 ENV BABELFISH_HOME=/opt/babelfish
+ENV POSTGRES_USER_HOME=/var/lib/babelfish
 
 # Copy binaries to run stage
 WORKDIR ${BABELFISH_HOME}
 COPY --from=0 ${BABELFISH_HOME} .
 
 # Install runtime dependencies
 RUN apt update && apt install -y --no-install-recommends\
-	libssl1.1 openssl libldap-2.4-2 libxml2 libpam0g uuid libossp-uuid16\
-	libxslt1.1 libicu66 libpq5 unixodbc
+	libssl3 openssl libldap-2.5-0 libxml2 libpam0g uuid libossp-uuid16\
+	libxslt1.1 libicu70 libpq5 unixodbc
 
 # Enable data volume
-ENV BABELFISH_DATA=/data/babelfish
-RUN mkdir /data
-VOLUME /data
-RUN mkdir ${BABELFISH_DATA}
+ENV BABELFISH_DATA=${POSTGRES_USER_HOME}/data
+RUN mkdir -p ${BABELFISH_DATA}
+VOLUME ${BABELFISH_DATA}
 
 # Create postgres user
-RUN adduser postgres --home ${BABELFISH_DATA}
-RUN chown postgres ${BABELFISH_DATA}
-RUN chmod 750 ${BABELFISH_DATA}
+RUN adduser postgres --home ${POSTGRES_USER_HOME}
+RUN chown -R postgres ${BABELFISH_HOME}
+RUN chown -R postgres ${POSTGRES_USER_HOME}
 
 # Change to postgres user
 USER postgres

README.md

@@ -49,7 +49,7 @@ Starting with the `2.3.0` image pushed on Mar 4, 2023, encryption (SSL) support
 As a very basic example, to enable encryption with a *self-signed* certificate that *expires in 365 days* and has a *subject of localhost*, in the container's terminal run the following commands:
 
 ```sh
-cd /data/babelfish
+cd /var/lib/babelfish/data
 openssl req -new -x509 -days 365 -nodes -text -out server.crt -keyout server.key -subj "/CN=localhost"
 chmod og-rwx server.key
 echo "ssl = on" >> postgresql.conf
@@ -80,10 +80,13 @@ Assuming Babelfish is hosted on the local machine, using the default settings, a
 
 ## Data Volume
 
-Database data is stored in the `/data` volume.
+Database data is stored in the `/var/lib/babelfish/data` volume.
 
 ## Building Docker Image
 
+> [!IMPORTANT]
+> The Dockerfile was changed for `BABEL_5_2_0__PG_17_5`. To build an earlier version, the `before-BABEL_5_2_0__PG_17_5` branch should be used.
+
 To build the Docker image, clone the repository and then run `docker build .`.
 
 To use a different Babelfish version, you can:
@@ -93,6 +96,8 @@ To use a different Babelfish version, you can:
 
 The Babelfish version tags are listed at https://github.com/babelfish-for-postgresql/babelfish-for-postgresql/tags.
 
+
+
 ## Other Extensions
 
 Adding other extensions is outside of the scope of this project. They may not be able to be used through Babelfish and may cause issues with the Babelfish extensions or not work as expected.

start.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 BABELFISH_HOME=/opt/babelfish
-BABELFISH_DATA=/data/babelfish
+BABELFISH_DATA=/var/lib/babelfish/data
 
 cd ${BABELFISH_HOME}/bin