Upgrade superset-db based on postgres:12-bullseye image

Author: savvan0h

docker-compose.yml

@@ -107,12 +107,10 @@ services:
   superset-db:
     build: superset-db
     container_name: superset-db
-    ports:
-      - "5433:5432"
-    volumes:
-      - superset-db:/var/lib/pgsql/9.6/data
-    user: postgres
     environment:
+      - POSTGRES_USER=superset
+      - POSTGRES_PASSWORD=superset
+      - POSTGRES_DB=superset
       - LRS_HOST=learninglocker_mongo
       - LRS_PORT=27017
       - LRS_DB=learninglocker
@@ -125,6 +123,9 @@ services:
       - LRW_DB_USER=caliper
       - LRW_DB_PASSWORD=caliper
       - LRW_COLLECTION=mongoEvent
+    volumes:
+      - ./superset-db/init:/docker-entrypoint-initdb.d
+      - superset-db:/var/lib/postgresql/data
   jupyterhub:
     build: jupyterhub
     container_name: jupyterhub

superset-db/Dockerfile

@@ -1,49 +1,16 @@
-FROM centos:centos7
+FROM postgres:12-bullseye
 
-LABEL version="2.3.3"
+LABEL version="3.0.0"
 
 # Install dependencies
-RUN yum update -y && \
-    yum install -y \
-      gcc \
-      gcc-c++ \
+RUN apt update && \
+    apt install -y \
       git \
-      make \
-      python-devel \
-      which
-
-# Install pip and setuptools
-RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py && \
-    python get-pip.py
-
-# Install PostgreSQL 9.6
-COPY pgdg-96.repo /etc/yum.repos.d/
-RUN yum install -y \
-      postgresql96-contrib \
-      postgresql96-devel \
-      postgresql96-server
-
-# Add path to commands
-ENV PATH $PATH:/usr/pgsql-9.6/bin
-
-# Install Multicorn
-WORKDIR /usr/local/src
-RUN git clone https://github.com/Kozea/Multicorn.git --depth 1 -b v1.4.0 && \
-    cd Multicorn && \
-    make && make install
+      postgresql-12-python3-multicorn \
+      python3-setuptools
 
 # Install yam_fdw
 WORKDIR /usr/local/src
 RUN git clone https://github.com/udzuki/yam_fdw.git && \
     cd yam_fdw && \
-    python setup.py install
-
-# Prepare init scripts
-USER postgres
-ENV PGDATA /var/lib/pgsql/9.6/data
-COPY --chown=postgres:postgres \
-  entrypoint.sh pg_hba.conf postgresql.conf setup.sh /init/
-RUN chmod 755 /init/entrypoint.sh /init/setup.sh
-EXPOSE 5432
-ENTRYPOINT ["/init/entrypoint.sh"]
-CMD ["postgres"]
+    python3 setup.py install

superset-db/setup.sh superset-db/init/setup.shsuperset-db/setup.sh renamed to superset-db/init/setup.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
+set -e
 
-psql -p $1 << EOF
-/* Create database used to store Superset users, etc. */
-CREATE DATABASE superset;
-
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
 /* Create database used to store data analysis results done with JupyterHub */
 CREATE DATABASE jupyter;
 
@@ -134,4 +132,4 @@ CREATE FOREIGN TABLE caliper_statements (
   password '$LRW_DB_PASSWORD',
   collection '$LRW_COLLECTION'
 );
-EOF
+EOSQL