Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: mrjones <[email protected]>
Co-authored-by: Kenn Sippell <[email protected]>
  • Loading branch information
3 people authored Jun 25, 2024
1 parent 31e91d1 commit 87a8af1
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ENV PORT 3000
WORKDIR /app

HEALTHCHECK --interval=30s --timeout=3s \
CMD wget --spider http://localhost:${PORT}/_healthz || exit 1
CMD wget --spider http://127.0.0.1:${PORT}/_healthz || exit 1

COPY package*.json ./
RUN apk add git
Expand Down
7 changes: 7 additions & 0 deletions docker-local-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ fi
if [[ -n $1 ]] && [[ $1 == "build" ]]; then
docker build -f Dockerfile -t cht-user-management:local .
docker build -f Dockerfile.worker -t cht-user-management-worker:local .
elif [[ -z "$(docker images -q cht-user-management:local 2> /dev/null)" ]] || [[ -z "$(docker images -q cht-user-management-worker:local 2> /dev/null)" ]]; then
echo;echo "Docker images not found - please call
./docker-local-setup.sh build
to build missing images";echo;
exit 1
fi

echo;echo "Starting Docker Compose...";echo
Expand Down
6 changes: 3 additions & 3 deletions env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NODE_ENV=
COOKIE_PRIVATE_KEY=
QUEUE_PRIVATE_KEY= # should be different from COOKIE_PRIVATE_KEY
NODE_ENV= # set to "dev" to use CHT_DEV_URL_PORT below, leave empty for production
COOKIE_PRIVATE_KEY= # unique random key, use uuidgen to populate
QUEUE_PRIVATE_KEY= # unique random key, use uuidgen to populate. different from COOKIE_PRIVATE_KEY
CONFIG_NAME=chis-ke # Name of the configuration
PORT=3000 # for development environmentcontainer)
EXTERNAL_PORT=3000 # for docker
Expand Down
2 changes: 1 addition & 1 deletion src/liquid/place/move_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h1 class="subtitle">To</h1>
pauseOnHover: true,
type: 'is-success',
position: 'top-center',
message: `<p>This will be moved shortly! It may take up to 24 hours to process.</p>`,
message: `<p>Move has been scheduled. Please allow up to 24 hours for processing.</p>`,
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/worker/move-contact-worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class MoveContactWorker {
if (code === 0) {
resolve();
}
reject(new Error(`cht-conf exited with code ${code}. Last output: ${lastOutput}`));
reject(new Error(`Move contact command exited with code ${code}. Last output: ${lastOutput}`));
});

chtProcess.on('error', error => {
Expand Down

0 comments on commit 87a8af1

Please sign in to comment.