Skip to content

Commit a425b5f

Browse files
cytopiacytopia
committed
Fix install errors
1 parent e02e778 commit a425b5f

16 files changed

Lines changed: 704 additions & 488 deletions

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
## Release 0.139
88

99
#### Added
10-
- Added mongodb command line client
11-
- Added postgresql command line client for PHP 7.1+
10+
- (Re-)added mongodb command line client
11+
- (Re-)added postgresql command line client
1212

1313
### Changed
1414
- Speed up `xargs` commands by using multi-CPU

‎Dockerfiles/work/Dockerfile-5.2‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ 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-
&& 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 \
6361
\
6462
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6563
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,20 +98,6 @@ RUN set -eux \
10098
\
10199
mysql-client \
102100
\
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 ) \
117101
mupdf \
118102
mupdf-tools \
119103
nano \
@@ -122,9 +106,6 @@ RUN set -eux \
122106
openssh-client \
123107
patch \
124108
patchelf \
125-
\
126-
postgresql-client \
127-
\
128109
redis-tools \
129110
rsync \
130111
rubygems \
@@ -149,20 +130,7 @@ RUN set -eux \
149130
\
150131
&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
151132
&& (find /usr/local/lib -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
133+
&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
166134

167135

168136
###
@@ -205,6 +173,29 @@ RUN set -eux \
205173
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
206174
\
207175
\
176+
# -------------------- pgsql_client --------------------
177+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
178+
curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
179+
&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
180+
&& apt-get update; \
181+
fi \
182+
\
183+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
184+
apt-get install -y --no-install-recommends --no-install-suggests \
185+
postgresql-client; \
186+
fi \
187+
\
188+
&& rm -rf /var/lib/apt/lists/* \
189+
\
190+
# -------------------- mongo_client --------------------
191+
&& apt-get update \
192+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
193+
apt-get install -y --no-install-recommends --no-install-suggests \
194+
mongodb-clients; \
195+
fi \
196+
\
197+
&& rm -rf /var/lib/apt/lists/* \
198+
\
208199
# -------------------- awesomeci --------------------
209200
&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
210201
&& cd /usr/local/src/awesome-ci \
@@ -629,6 +620,22 @@ RUN set -eux \
629620
# -------------------- Software --------------------
630621
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
631622
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
623+
\
624+
&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
625+
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
626+
pg_isready --version; \
627+
fi \
628+
else \
629+
pg_isready --version; \
630+
fi \
631+
\
632+
&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
633+
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
634+
mongofiles --version; \
635+
fi \
636+
else \
637+
mongofiles --version; \
638+
fi \
632639
\
633640
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
634641
&& git-flow version | grep -E '[0-9][.0-9]+' \

‎Dockerfiles/work/Dockerfile-5.3‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ 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-
&& 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 \
6361
\
6462
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6563
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,20 +98,6 @@ RUN set -eux \
10098
\
10199
mysql-client \
102100
\
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 ) \
117101
mupdf \
118102
mupdf-tools \
119103
nano \
@@ -122,9 +106,6 @@ RUN set -eux \
122106
openssh-client \
123107
patch \
124108
patchelf \
125-
\
126-
postgresql-client \
127-
\
128109
redis-tools \
129110
rsync \
130111
rubygems \
@@ -149,20 +130,7 @@ RUN set -eux \
149130
\
150131
&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
151132
&& (find /usr/local/lib -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
133+
&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
166134

167135

168136
###
@@ -217,6 +185,29 @@ RUN set -eux \
217185
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
218186
\
219187
\
188+
# -------------------- pgsql_client --------------------
189+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
190+
curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
191+
&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
192+
&& apt-get update; \
193+
fi \
194+
\
195+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
196+
apt-get install -y --no-install-recommends --no-install-suggests \
197+
postgresql-client; \
198+
fi \
199+
\
200+
&& rm -rf /var/lib/apt/lists/* \
201+
\
202+
# -------------------- mongo_client --------------------
203+
&& apt-get update \
204+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
205+
apt-get install -y --no-install-recommends --no-install-suggests \
206+
mongodb-clients; \
207+
fi \
208+
\
209+
&& rm -rf /var/lib/apt/lists/* \
210+
\
220211
# -------------------- awesomeci --------------------
221212
&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
222213
&& cd /usr/local/src/awesome-ci \
@@ -691,6 +682,22 @@ RUN set -eux \
691682
&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
692683
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
693684
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
685+
\
686+
&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
687+
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
688+
pg_isready --version; \
689+
fi \
690+
else \
691+
pg_isready --version; \
692+
fi \
693+
\
694+
&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
695+
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
696+
mongofiles --version; \
697+
fi \
698+
else \
699+
mongofiles --version; \
700+
fi \
694701
\
695702
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
696703
&& drush7 --version | grep -E '7[.0-9]+\s*$' \

‎Dockerfiles/work/Dockerfile-5.4‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ 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-
&& 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 \
6361
\
6462
&& DEBIAN_FRONTEND=noninteractive apt-get update \
6563
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,20 +98,6 @@ RUN set -eux \
10098
\
10199
mysql-client \
102100
\
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 ) \
117101
mupdf \
118102
mupdf-tools \
119103
nano \
@@ -122,9 +106,6 @@ RUN set -eux \
122106
openssh-client \
123107
patch \
124108
patchelf \
125-
\
126-
postgresql-client \
127-
\
128109
redis-tools \
129110
rsync \
130111
rubygems \
@@ -149,20 +130,7 @@ RUN set -eux \
149130
\
150131
&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
151132
&& (find /usr/local/lib -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
133+
&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)
166134

167135

168136
###
@@ -217,6 +185,29 @@ RUN set -eux \
217185
&& su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
218186
\
219187
\
188+
# -------------------- pgsql_client --------------------
189+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
190+
curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
191+
&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
192+
&& apt-get update; \
193+
fi \
194+
\
195+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
196+
apt-get install -y --no-install-recommends --no-install-suggests \
197+
postgresql-client; \
198+
fi \
199+
\
200+
&& rm -rf /var/lib/apt/lists/* \
201+
\
202+
# -------------------- mongo_client --------------------
203+
&& apt-get update \
204+
&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
205+
apt-get install -y --no-install-recommends --no-install-suggests \
206+
mongodb-clients; \
207+
fi \
208+
\
209+
&& rm -rf /var/lib/apt/lists/* \
210+
\
220211
# -------------------- awesomeci --------------------
221212
&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
222213
&& cd /usr/local/src/awesome-ci \
@@ -729,6 +720,22 @@ RUN set -eux \
729720
&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
730721
&& su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
731722
&& su -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
723+
\
724+
&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
725+
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
726+
pg_isready --version; \
727+
fi \
728+
else \
729+
pg_isready --version; \
730+
fi \
731+
\
732+
&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
733+
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
734+
mongofiles --version; \
735+
fi \
736+
else \
737+
mongofiles --version; \
738+
fi \
732739
\
733740
&& regex-grep --version | grep -E '[0-9][.0-9]+' \
734741
&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \

0 commit comments

Comments
 (0)