MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better delineate what is our CouchDB image and what is from the official one.

This commit is contained in:
Sam Rose 2024-02-13 15:35:44 +00:00
parent 4bcf133259
commit 634b3b43dd
No known key found for this signature in database
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hosting/couchdb/Dockerfile
View File

@ -1,5 +1,10 @@
# Modified from https://github.com/apache/couchdb-docker/blob/main/3.2.1/Dockerfile # Modified from https://github.com/apache/couchdb-docker/blob/main/3.2.1/Dockerfile
FROM node:20-slim #
# Everything in this `base` image is adapted from the official `couchdb` image's
# Dockerfile. Only modifications related to upgrading from Debian bullseye to
# bookworm have been included. The `runner` image contains Budibase's
# customisations to the image, e.g. adding Clouseau.
FROM node:20-slim AS base
# Add CouchDB user account to make sure the IDs are assigned consistently # Add CouchDB user account to make sure the IDs are assigned consistently
RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb couchdb RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb couchdb
@ -15,13 +20,12 @@ RUN set -ex; \
; \ ; \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# grab gosu for easy step-down from root and tini for signal handling and zombie reaping # grab tini for signal handling and zombie reaping
# see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407 # see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407
RUN set -eux; \ RUN set -eux; \
apt-get update; \ apt-get update; \
apt-get install -y --no-install-recommends gosu tini; \ apt-get install -y --no-install-recommends tini; \
rm -rf /var/lib/apt/lists/*; \ rm -rf /var/lib/apt/lists/*; \
gosu nobody true; \
tini --version tini --version
# http://docs.couchdb.org/en/latest/install/unix.html#installing-the-apache-couchdb-packages # http://docs.couchdb.org/en/latest/install/unix.html#installing-the-apache-couchdb-packages
@ -89,7 +93,9 @@ VOLUME /opt/couchdb/data
# 4369: Erlang portmap daemon (epmd) # 4369: Erlang portmap daemon (epmd)
# 9100: CouchDB cluster communication port # 9100: CouchDB cluster communication port
EXPOSE 5984 4369 9100 EXPOSE 5984 4369 9100
# CMD ["/opt/couchdb/bin/couchdb"] CMD ["/opt/couchdb/bin/couchdb"]
FROM base as runner
ENV COUCHDB_USER admin ENV COUCHDB_USER admin
ENV COUCHDB_PASSWORD admin ENV COUCHDB_PASSWORD admin

5
hosting/couchdb/docker-entrypoint.sh
View File

@ -114,8 +114,9 @@ EOWARN
fi fi
if [ "$(id -u)" = '0' ]; then if [ "$(id -u)" = '0' ]; then
exec gosu couchdb "$@" export HOME=$(echo ~couchdb)
exec setpriv --reuid=couchdb --regid=couchdb --clear-groups "$@"
fi fi
fi fi
exec "$@" exec "$@"

2
hosting/single/Dockerfile
View File

@ -38,7 +38,7 @@ COPY packages/worker/pm2.config.js packages/worker/pm2.config.js
COPY packages/string-templates packages/string-templates COPY packages/string-templates packages/string-templates
FROM budibase/couchdb as runner FROM budicouch as runner
ARG TARGETARCH ARG TARGETARCH
ENV TARGETARCH $TARGETARCH ENV TARGETARCH $TARGETARCH
#TARGETBUILD can be set to single (for single docker image) or aas (for azure app service) #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)