data-serving-relational: use gosu instead of sudo for tty-less operation

parsa-epfl · Nov 29, 2023 · a67b88d · a67b88d
1 parent 07ec9a2
commit a67b88d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/benchmarks/data-serving-relational/server/Dockerfile b/benchmarks/data-serving-relational/server/Dockerfile
@@ -1,7 +1,11 @@
 FROM cloudsuite/postgresql:15
 
 # Install sudo for user switching
-RUN apt update && apt install sudo python3 -y
+RUN set -eux ;  \
+    apt update ; \
+    apt install sudo python3 gosu -y ; \
+    rm -rf /var/lib/apt/lists/* ; \
+    gosu postgres true
 
 # Make the database access public
 RUN echo 'host\tall\tcloudsuite\t0.0.0.0/0\tscram-sha-256' >> /etc/postgresql/15/main/pg_hba.conf

diff --git a/benchmarks/data-serving-relational/server/docker-entrypoint.py b/benchmarks/data-serving-relational/server/docker-entrypoint.py
@@ -81,8 +81,8 @@ def save_dict(config_dict, lines):
         f.writelines(file_txt)
 
 os.system("service postgresql start")
-os.system("sudo -u postgres psql -c \"CREATE USER cloudsuite WITH PASSWORD 'cloudsuite';\"") # Create the user called `cloudsuite`
-os.system("sudo -u postgres psql -c \"CREATE DATABASE sbtest;\"") # Create a table named sbtest
-os.system("sudo -u postgres psql -c \"GRANT ALL PRIVILEGES ON DATABASE sbtest TO cloudsuite\"") # Gave permission to this table
-os.system("sudo -u postgres psql sbtest -c \"GRANT ALL ON SCHEMA public TO cloudsuite;\"")
-os.system("sudo -u postgres psql")
+os.system("gosu postgres psql -c \"CREATE USER cloudsuite WITH PASSWORD 'cloudsuite';\"") # Create the user called `cloudsuite`
+os.system("gosu postgres psql -c \"CREATE DATABASE sbtest;\"") # Create a table named sbtest
+os.system("gosu postgres psql -c \"GRANT ALL PRIVILEGES ON DATABASE sbtest TO cloudsuite\"") # Gave permission to this table
+os.system("gosu postgres psql sbtest -c \"GRANT ALL ON SCHEMA public TO cloudsuite;\"")
+os.system("gosu postgres psql")