Skip to content
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.

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

Gorm tests #594

Merged
merged 27 commits into from
Mar 18, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
fix
  • Loading branch information
NikitaUnisikhin committed Mar 18, 2024
commit e69807147fe8d4c1e0a64f266de8c9e93a4b668b
3 changes: 0 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -55,9 +55,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN curl -fsSL https://get.docker.com -o get-docker.sh && \
sudo sh get-docker.sh

RUN curl -fsSL https://get.docker.com -o get-docker.sh && \
sudo sh get-docker.sh

COPY ./docker/pg/pg_hba-test.conf /etc/postgresql/14/main/pg_hba.conf

RUN mkdir test_dir
11 changes: 5 additions & 6 deletions docker/bin/setup
Original file line number Diff line number Diff line change
@@ -50,7 +50,6 @@ sudo -u postgres /usr/lib/postgresql/14/bin/pg_ctl -D /var/lib/postgresql/14/rep

# Create databases
for database_name in db scram_db ldap_db auth_query_db db1 hba_db tsa_db addr_db xproto_db "spqr-console"; do
for database_name in db scram_db ldap_db auth_query_db db1 hba_db tsa_db addr_db "spqr-console"; do
sudo -u postgres createdb $database_name >> "$SETUP_LOG" 2>&1 || {
echo "ERROR: 'createdb $database_name' failed, examine the log"
cat "$SETUP_LOG"
@@ -137,11 +136,11 @@ psql -h localhost -p 5432 -U postgres -c "create user user_addr_correct passwor
}

# Create users
psql -h localhost -p 5432 -U postgres -c "create user \"spqr-console\";" >> $SETUP_LOG 2>&1 || {
echo "ERROR: users creation failed, examine the log"
cat "$SETUP_LOG"
cat "$PG_LOG"
exit 1
psql -h localhost -p 5432 -U postgres -c "create role xproto SUPERUSER LOGIN" -d xproto_db >> $SETUP_LOG 2>&1 || {
echo "ERROR: users creation failed, examine the log"
cat "$SETUP_LOG"
cat "$PG_LOG"
exit 1
}

# Create users
Loading