Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hivemind
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hive
hivemind
Commits
908da629
Commit
908da629
authored
2 months ago
by
Andrzej Such
Browse files
Options
Downloads
Patches
Plain Diff
Remove postgrest.conf. All postgrest configuration in start_postgrest.sh scripts and variables
parent
16dff51f
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+0
-1
0 additions, 1 deletion
Dockerfile
docker/docker_entrypoint.sh
+2
-2
2 additions, 2 deletions
docker/docker_entrypoint.sh
postgrest.conf
+0
-7
0 additions, 7 deletions
postgrest.conf
scripts/start_postgrest.sh
+6
-2
6 additions, 2 deletions
scripts/start_postgrest.sh
with
8 additions
and
12 deletions
Dockerfile
+
0
−
1
View file @
908da629
...
@@ -132,7 +132,6 @@ COPY --from=builder --chown=hivemind:hivemind /home/hivemind/app/haf/scripts/co
...
@@ -132,7 +132,6 @@ COPY --from=builder --chown=hivemind:hivemind /home/hivemind/app/haf/scripts/co
COPY
--from=builder --chown=hivemind:hivemind /home/hivemind/app/mock_data/block_data /home/hivemind/app/mock_data/block_data
COPY
--from=builder --chown=hivemind:hivemind /home/hivemind/app/mock_data/block_data /home/hivemind/app/mock_data/block_data
COPY
--from=builder --chown=hivemind:hivemind /home/hivemind/app/mock_data/vops_data /home/hivemind/app/mock_data/vops_data
COPY
--from=builder --chown=hivemind:hivemind /home/hivemind/app/mock_data/vops_data /home/hivemind/app/mock_data/vops_data
COPY
--from=builder --chown=hivemind:hivemind --exclude=haf/* /home/hivemind/app/reputation_tracker /home/hivemind/app/reputation_tracker
COPY
--from=builder --chown=hivemind:hivemind --exclude=haf/* /home/hivemind/app/reputation_tracker /home/hivemind/app/reputation_tracker
COPY
--from=builder --chown=hivemind:hivemind /home/hivemind/app/postgrest.conf .
# JSON rpc service
# JSON rpc service
EXPOSE
${HTTP_PORT}
EXPOSE
${HTTP_PORT}
...
...
This diff is collapsed.
Click to expand it.
docker/docker_entrypoint.sh
+
2
−
2
View file @
908da629
...
@@ -105,11 +105,11 @@ run_server() {
...
@@ -105,11 +105,11 @@ run_server() {
if
[[
-n
"
$LOG_PATH
"
]]
;
then
if
[[
-n
"
$LOG_PATH
"
]]
;
then
log
"run_hive"
"Starting hivemind postgrest server with log
$LOG_PATH
"
log
"run_hive"
"Starting hivemind postgrest server with log
$LOG_PATH
"
echo
"Running postgrest setup..."
echo
"Running postgrest setup..."
exec
"
$SCRIPT_DIR
/app/
ci/
start_postgrest.sh"
"
${
HIVEMIND_ARGS
[@]
}
"
--postgres-url
=
"
${
POSTGRES_URL
}
"
>
>(
tee
-i
"
$LOG_PATH
"
)
2>&1
exec
"
$SCRIPT_DIR
/app/start_postgrest.sh"
"
${
HIVEMIND_ARGS
[@]
}
"
--postgres-url
=
"
${
POSTGRES_URL
}
"
>
>(
tee
-i
"
$LOG_PATH
"
)
2>&1
else
else
log
"run_hive"
"Starting hivemind postgrest server..."
log
"run_hive"
"Starting hivemind postgrest server..."
echo
"Running postgrest setup..."
echo
"Running postgrest setup..."
exec
"
$SCRIPT_DIR
/app/
ci/
start_postgrest.sh"
"
${
HIVEMIND_ARGS
[@]
}
"
--postgres-url
=
"
${
POSTGRES_URL
}
"
exec
"
$SCRIPT_DIR
/app/start_postgrest.sh"
"
${
HIVEMIND_ARGS
[@]
}
"
--postgres-url
=
"
${
POSTGRES_URL
}
"
fi
fi
}
}
...
...
This diff is collapsed.
Click to expand it.
postgrest.conf
deleted
100644 → 0
+
0
−
7
View file @
16dff51f
db
-
uri
=
"postgres://haf_admin@/haf_block_log"
db
-
schema
=
"hivemind_endpoints"
db
-
anon
-
role
=
"hivemind"
db
-
pool
=
20
db
-
pool
-
acquisition
-
timeout
=
10
server
-
port
=
8080
admin
-
server
-
port
=
3001
This diff is collapsed.
Click to expand it.
scripts/
ci/
start_postgrest.sh
→
scripts/start_postgrest.sh
+
6
−
2
View file @
908da629
...
@@ -54,9 +54,13 @@ start_webserver() {
...
@@ -54,9 +54,13 @@ start_webserver() {
export
PGRST_SERVER_PORT
=
$WEBSERVER_PORT
export
PGRST_SERVER_PORT
=
$WEBSERVER_PORT
export
PGRST_ADMIN_SERVER_PORT
=
$ADMIN_PORT
export
PGRST_ADMIN_SERVER_PORT
=
$ADMIN_PORT
export
PGRST_LOG_LEVEL
=
$LOG_LEVEL
export
PGRST_LOG_LEVEL
=
$LOG_LEVEL
#export PGRST_DB_ROOT_SPEC="home"
export
PGRST_DB_SCHEMAS
=
"hivemind_endpoints"
export
PGRST_DB_ANON_ROLE
=
"hivemind"
export
PGRST_DB_POOL
=
20
export
PGRST_DB_POOL_ACQUISITION_TIMEOUT
=
10
#export PGRST_DB_ROOT_SPEC="home" #this may be need to be uncommented in local environment to let tests work, if empty jsons are
postgrest
postgrest.conf
postgrest
}
}
start_webserver
start_webserver
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment