mirror of
https://github.com/devilbox/docker-php-fpm.git
synced 2025-12-10 11:01:14 +00:00
Fix install errors
This commit is contained in:
@@ -58,10 +58,6 @@ RUN set -eux \
|
||||
&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
|
||||
&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
|
||||
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
|
||||
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
|
||||
&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
|
||||
&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
|
||||
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
|
||||
\
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get update \
|
||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
|
||||
@@ -103,21 +99,6 @@ RUN set -eux \
|
||||
\
|
||||
mariadb-client \
|
||||
\
|
||||
# 5.2: mongodb-clients (amd64)
|
||||
# 5.3: mongodb-clients (amd64)
|
||||
# 5.4: mongodb-clients (amd64)
|
||||
# 5.5: mongodb-clients (amd64)
|
||||
# 5.6: mongodb-clients (amd64, arm64)
|
||||
# 7.0: mongodb-clients (amd64, arm64)
|
||||
# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
|
||||
# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
|
||||
# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
|
||||
# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
|
||||
# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
|
||||
# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
|
||||
# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
|
||||
mongodb-org-tools \
|
||||
mongodb-org-shell \
|
||||
mupdf \
|
||||
mupdf-tools \
|
||||
nano \
|
||||
@@ -126,9 +107,6 @@ RUN set -eux \
|
||||
openssh-client \
|
||||
patch \
|
||||
patchelf \
|
||||
\
|
||||
postgresql-client \
|
||||
\
|
||||
redis-tools \
|
||||
rsync \
|
||||
rubygems \
|
||||
@@ -153,18 +131,7 @@ RUN set -eux \
|
||||
\
|
||||
&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
|
||||
&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
|
||||
&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
|
||||
\
|
||||
# Check version: mongofiles
|
||||
&& mongofiles --version \
|
||||
\
|
||||
# Check version: pg_isready
|
||||
&& pg_isready --version \
|
||||
\
|
||||
# Check version: mysql
|
||||
&& mysql --version \
|
||||
\
|
||||
&& true
|
||||
&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
|
||||
|
||||
|
||||
###
|
||||
@@ -220,6 +187,27 @@ RUN set -eux \
|
||||
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
|
||||
\
|
||||
\
|
||||
# -------------------- pgsql_client --------------------
|
||||
&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
|
||||
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
|
||||
&& apt-get update \
|
||||
\
|
||||
&& apt-get install -y --no-install-recommends --no-install-suggests \
|
||||
postgresql-client \
|
||||
\
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
\
|
||||
# -------------------- mongo_client --------------------
|
||||
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
|
||||
&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
|
||||
&& apt-get update \
|
||||
\
|
||||
&& apt-get install -y --no-install-recommends --no-install-suggests \
|
||||
mongodb-org-tools \
|
||||
mongodb-org-shell \
|
||||
\
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
\
|
||||
# -------------------- awesomeci --------------------
|
||||
&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
|
||||
&& cd /usr/local/src/awesome-ci \
|
||||
@@ -661,6 +649,22 @@ RUN set -eux \
|
||||
&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
|
||||
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
|
||||
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
|
||||
\
|
||||
&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
|
||||
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||
pg_isready --version; \
|
||||
fi \
|
||||
else \
|
||||
pg_isready --version; \
|
||||
fi \
|
||||
\
|
||||
&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
|
||||
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
|
||||
mongofiles --version; \
|
||||
fi \
|
||||
else \
|
||||
mongofiles --version; \
|
||||
fi \
|
||||
\
|
||||
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
|
||||
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
|
||||
|
||||
Reference in New Issue
Block a user