-
Notifications
You must be signed in to change notification settings - Fork 158
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #537 from getodk/next
Release v2023.5
- Loading branch information
Showing
10 changed files
with
71 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
FROM node:18.17 | ||
FROM node:20.10-slim | ||
|
||
COPY files/enketo/generate-secrets.sh ./ |
Submodule server
updated
72 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,69 @@ | ||
ARG node_version=18.17 | ||
FROM node:${node_version} as intermediate | ||
ARG node_version=20.10 | ||
|
||
|
||
|
||
FROM node:${node_version}-slim as pgdg | ||
RUN apt-get update \ | ||
&& apt-get install -y --no-install-recommends \ | ||
ca-certificates \ | ||
curl \ | ||
gpg \ | ||
&& rm -rf /var/lib/apt/lists/* \ | ||
&& update-ca-certificates | ||
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(grep -oP 'VERSION_CODENAME=\K\w+' /etc/os-release)-pgdg main" \ | ||
| tee /etc/apt/sources.list.d/pgdg.list \ | ||
&& curl https://www.postgresql.org/media/keys/ACCC4CF8.asc \ | ||
| gpg --dearmor > /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg | ||
|
||
|
||
|
||
FROM node:${node_version}-slim as intermediate | ||
RUN apt-get update \ | ||
&& apt-get install -y --no-install-recommends \ | ||
git \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
COPY . . | ||
RUN mkdir /tmp/sentry-versions | ||
RUN git describe --tags --dirty > /tmp/sentry-versions/central | ||
WORKDIR server | ||
WORKDIR /server | ||
RUN git describe --tags --dirty > /tmp/sentry-versions/server | ||
WORKDIR ../client | ||
WORKDIR /client | ||
RUN git describe --tags --dirty > /tmp/sentry-versions/client | ||
|
||
FROM node:${node_version} | ||
|
||
WORKDIR /usr/odk | ||
|
||
RUN apt-get update && apt-get install wait-for-it && rm -rf /var/lib/apt/lists/* | ||
FROM node:${node_version}-slim | ||
|
||
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(grep -oP 'VERSION_CODENAME=\K\w+' /etc/os-release)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list && \ | ||
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg && \ | ||
apt-get update && \ | ||
apt-get install -y cron gettext postgresql-client-14 | ||
ARG node_version | ||
LABEL org.opencontainers.image.source="https://github.com/getodk/central" | ||
|
||
COPY files/service/crontab /etc/cron.d/odk | ||
WORKDIR /usr/odk | ||
|
||
COPY server/package*.json ./ | ||
|
||
RUN npm clean-install --omit=dev --legacy-peer-deps --no-audit --fund=false --update-notifier=false | ||
COPY --from=pgdg /etc/apt/sources.list.d/pgdg.list \ | ||
/etc/apt/sources.list.d/pgdg.list | ||
COPY --from=pgdg /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg \ | ||
/etc/apt/trusted.gpg.d/apt.postgresql.org.gpg | ||
RUN apt-get update \ | ||
&& apt-get install -y --no-install-recommends \ | ||
gpg \ | ||
cron \ | ||
wait-for-it \ | ||
gettext \ | ||
procps \ | ||
postgresql-client-14 \ | ||
netcat-traditional \ | ||
&& rm -rf /var/lib/apt/lists/* \ | ||
&& npm clean-install --omit=dev --legacy-peer-deps --no-audit \ | ||
--fund=false --update-notifier=false | ||
|
||
COPY server/ ./ | ||
COPY files/service/scripts/ ./ | ||
|
||
COPY files/service/config.json.template /usr/share/odk/ | ||
COPY files/service/crontab /etc/cron.d/odk | ||
COPY files/service/odk-cmd /usr/bin/ | ||
|
||
COPY --from=intermediate /tmp/sentry-versions/ ./sentry-versions | ||
|
||
EXPOSE 8383 | ||
|