Skip to content

chore: Add Postgres bin to PATH #34265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharat87 merged 4 commits into from
Jun 17, 2024
Merged

chore: Add Postgres bin to PATH #34265

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
914ddd8
chore: Add Postgres bin to PATH
sharat87 Jun 17, 2024
1012266
Update entrypoint.sh
sharat87 Jun 17, 2024
9079f37
chore: merge release branch
sharat87 Jun 17, 2024
ead59d4
Merge remote-tracking branch 'origin/chore/pg-to-path' into chore/pg-…
sharat87 Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deploy/docker/base.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ RUN set -o xtrace \
&& ln -s /usr/lib/postgresql/13 /usr/lib/postgresql/current \
&& apt-get clean

ENV PATH="/usr/lib/postgresql/13/bin:${PATH}"

# Install Java
RUN set -o xtrace \
&& mkdir -p /opt/java \
Expand Down
13 changes: 8 additions & 5 deletions deploy/docker/fs/opt/appsmith/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ set -e

tlog "Running as: $(id)"

# Temporary, remove after this change goes into `base.dockerfile`.
export PATH="/usr/lib/postgresql/13/bin:${PATH}"
Comment thread
sharat87 marked this conversation as resolved.

stacks_path=/appsmith-stacks

export SUPERVISORD_CONF_TARGET="$TMP/supervisor-conf.d/" # export for use in supervisord.conf
Expand Down Expand Up @@ -435,16 +438,16 @@ init_postgres() {
chown postgres:postgres "$POSTGRES_DB_PATH"

# Initialize the postgres db file system
su postgres -c "/usr/lib/postgresql/13/bin/initdb -D $POSTGRES_DB_PATH"
su postgres -c "initdb -D $POSTGRES_DB_PATH"
sed -Ei "s,^#(unix_socket_directories =).*,\\1 '$TMP/pg-runtime'," "$POSTGRES_DB_PATH/postgresql.conf"

# Start the postgres server in daemon mode
su postgres -c "/usr/lib/postgresql/13/bin/pg_ctl -D $POSTGRES_DB_PATH start"
su postgres -c "pg_ctl -D $POSTGRES_DB_PATH start"

# Create mockdb db and user and populate it with the data
seed_embedded_postgres
# Stop the postgres daemon
su postgres -c "/usr/lib/postgresql/13/bin/pg_ctl stop -D $POSTGRES_DB_PATH"
su postgres -c "pg_ctl stop -D $POSTGRES_DB_PATH"
fi
else
runEmbeddedPostgres=0
Expand All @@ -456,14 +459,14 @@ seed_embedded_postgres(){
# Create mockdb database
psql -U postgres -c "CREATE DATABASE mockdb;"
# Create mockdb superuser
su postgres -c "/usr/lib/postgresql/13/bin/createuser mockdb -s"
su postgres -c "createuser mockdb -s"
# Dump the sql file containing mockdb data
psql -U postgres -d mockdb --file='/opt/appsmith/templates/mockdb_postgres.sql'

# Create users database
psql -U postgres -c "CREATE DATABASE users;"
# Create users superuser
su postgres -c "/usr/lib/postgresql/13/bin/createuser users -s"
su postgres -c "createuser users -s"
# Dump the sql file containing mockdb data
psql -U postgres -d users --file='/opt/appsmith/templates/users_postgres.sql'
}
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/fs/opt/appsmith/run-postgres.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

rm -f /appsmith-stacks/data/postgres/main/core.*
exec /usr/lib/postgresql/13/bin/postgres -D "/appsmith-stacks/data/postgres/main" -c listen_addresses=127.0.0.1
exec postgres -D "/appsmith-stacks/data/postgres/main" -c listen_addresses=127.0.0.1