From ffebb6f855b1f2a4b7bebc8b7a26215b3da43a4c Mon Sep 17 00:00:00 2001 From: kirill reshke Date: Fri, 5 Mar 2021 17:40:23 +0500 Subject: [PATCH] dockerbuild fix (#289) Co-authored-by: reshke --- docker/dpkg/Dockerfile | 2 +- docker/dpkg/entrypoint.sh | 2 +- sources/cron.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/dpkg/Dockerfile b/docker/dpkg/Dockerfile index d47c2bb8..0116ecbd 100644 --- a/docker/dpkg/Dockerfile +++ b/docker/dpkg/Dockerfile @@ -21,4 +21,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ RUN mkdir -p /pdbuild && mkdir -p /pgbin && mv /root/odys/tmp /pdbuild -ENTRYPOINT ["/root/odys/dpkg/entrypoint.sh"] +ENTRYPOINT ["/root/odys/docker/dpkg/entrypoint.sh"] diff --git a/docker/dpkg/entrypoint.sh b/docker/dpkg/entrypoint.sh index 43de9662..3206828a 100755 --- a/docker/dpkg/entrypoint.sh +++ b/docker/dpkg/entrypoint.sh @@ -6,7 +6,7 @@ export DEBIAN_FRONTEND=noninteractive export TZ=Europe/Moskow sudo bash -c "echo $TZ > /etc/timezone" -/root/odys/dpkg/tzdata.sh +/root/odys/docker/dpkg/tzdata.sh #compile pg #====================================================================================================================================== diff --git a/sources/cron.c b/sources/cron.c index d33aeead..30c0525f 100644 --- a/sources/cron.c +++ b/sources/cron.c @@ -211,9 +211,9 @@ static void od_cron(void *arg) return; } - // we take a lock here - // to prevent usage routes that are deallocated while shutdown - pthread_mutex_lock(&cron->lock); + // we take a lock here + // to prevent usage routes that are deallocated while shutdown + pthread_mutex_lock(&cron->lock); { /* mark and sweep expired idle server connections */ od_cron_expire(cron);