Skip to content

Commit

Permalink
Merge pull request #151 from HSLdevcom/development
Browse files Browse the repository at this point in the history
Update pg_dump in baseimage, change confusing startup message
  • Loading branch information
e-halinen authored Feb 5, 2024
2 parents 56a9353 + 7150860 commit eb0cf05
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
FROM node:18-buster-slim

ENV IMPORTER_DIR /opt/jore
ENV PG_CONNECTION_STRING="postgres://postgres:password@postgres:5432/postgres"
ENV NODE_ENV production

RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq postgresql-client --no-install-recommends \
&& apt-get install -yq curl gnupg lsb-release \
&& curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc|gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg \
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" |tee /etc/apt/sources.list.d/pgdg.list \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -yq postgresql-client-14 --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

WORKDIR ${IMPORTER_DIR}
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ createScheduledImport("daily", DAILY_TASK_SCHEDULE, async (onComplete = () => {}

// Start the task for the daily import as soon as the server starts.
// This will start the timer.
await reportInfo("Import started.");
await reportInfo("Service online");
startScheduledImport("daily");
server(() => isImporting, onBeforeImport, onAfterImport);
})();
Expand Down

0 comments on commit eb0cf05

Please sign in to comment.