@@ -58,8 +58,8 @@ RUN set -eux \
5858 && echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
5959 && curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
6060 && echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
61- && APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp ://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
62- && echo "deb http ://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git .list \
61+ && curl -sS -k -L --fail https ://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
62+ && echo "deb https ://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql .list \
6363 \
6464 && DEBIAN_FRONTEND=noninteractive apt-get update \
6565 && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,7 +100,20 @@ RUN set -eux \
100100 \
101101 mysql-client \
102102 \
103- mongodb-clients \
103+ # 5.2: mongodb-clients (amd64)
104+ # 5.3: mongodb-clients (amd64)
105+ # 5.4: mongodb-clients (amd64)
106+ # 5.5: mongodb-clients (amd64)
107+ # 5.6: mongodb-clients (amd64, arm64)
108+ # 7.0: mongodb-clients (amd64, arm64)
109+ # 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
110+ # 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
111+ # 7.3: mongodb-org-(tools|shell) (amd64, arm64)
112+ # 7.4: mongodb-org-(tools|shell) (amd64, arm64)
113+ # 8.0: mongodb-org-(tools|shell) (amd64, arm64)
114+ # 8.1: mongodb-org-(tools|shell) (amd64, arm64)
115+ # 8.2: mongodb-org-(tools|shell) (amd64, arm64)
116+ $( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
104117 mupdf \
105118 mupdf-tools \
106119 nano \
@@ -110,6 +123,7 @@ RUN set -eux \
110123 patch \
111124 patchelf \
112125 \
126+ postgresql-client \
113127 \
114128 redis-tools \
115129 rsync \
@@ -135,7 +149,20 @@ RUN set -eux \
135149 \
136150 && (find /usr/local/bin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
137151 && (find /usr/local/lib -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
138- && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
152+ && (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
153+ \
154+ # Check version: mongofiles
155+ && if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
156+ mongofiles --version; \
157+ fi \
158+ \
159+ # Check version: pg_isready
160+ && pg_isready --version \
161+ \
162+ # Check version: mysql
163+ && mysql --version \
164+ \
165+ && true
139166
140167
141168###
0 commit comments