Skip to content

Commit 1728629

Browse files
cytopiacytopia
authored
Merge pull request #79 from devilbox/release-0.60
Release 0.60
2 parents e55469f + dfaef4b commit 1728629

File tree

18 files changed

+77
-102
lines changed

18 files changed

+77
-102
lines changed

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ RUN set -x \
288288
# ---- Installing PHP Extension: phalcon ----
289289
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
290290
&& cd /tmp/phalcon \
291-
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
291+
&& git checkout $(git describe --abbrev=0 --tags) \
292292
&& cd build && ./install \
293293
&& docker-php-ext-enable phalcon \
294294
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ RUN set -x \
292292
# ---- Installing PHP Extension: phalcon ----
293293
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
294294
&& cd /tmp/phalcon \
295-
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
295+
&& git checkout $(git describe --abbrev=0 --tags) \
296296
&& cd build && ./install \
297297
&& docker-php-ext-enable phalcon \
298298
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ ENV BUILD_DEPS \
3939
libnghttp2-dev \
4040
libpng-dev \
4141
libpq-dev \
42-
libpspell-dev \
4342
librabbitmq-dev \
4443
librdkafka-dev \
4544
librecode-dev \
@@ -60,7 +59,6 @@ ENV BUILD_DEPS \
6059
git
6160

6261
ENV RUN_DEPS \
63-
libaspell15 \
6462
libc-client2007e \
6563
libenchant1c2a \
6664
libfbclient2 \
@@ -298,17 +296,12 @@ RUN set -x \
298296
# ---- Installing PHP Extension: phalcon ----
299297
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
300298
&& cd /tmp/phalcon \
301-
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
299+
&& git checkout $(git describe --abbrev=0 --tags) \
302300
&& cd build && ./install \
303301
&& docker-php-ext-enable phalcon \
304302
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
305303
&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
306304
\
307-
# ---- Installing PHP Extension: pspell ----
308-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
309-
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
310-
&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
311-
\
312305
# ---- Installing PHP Extension: recode ----
313306
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
314307
&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -553,8 +546,6 @@ RUN set -x \
553546
&& php-fpm -m | grep -oiE '^phalcon$' \
554547
&& php -m | grep -oiE '^posix$' \
555548
&& php-fpm -m | grep -oiE '^posix$' \
556-
&& php -m | grep -oiE '^pspell$' \
557-
&& php-fpm -m | grep -oiE '^pspell$' \
558549
&& php -m | grep -oiE '^readline$' \
559550
&& php-fpm -m | grep -oiE '^readline$' \
560551
&& php -m | grep -oiE '^recode$' \

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ ENV BUILD_DEPS \
3939
libnghttp2-dev \
4040
libpng-dev \
4141
libpq-dev \
42-
libpspell-dev \
4342
librabbitmq-dev \
4443
librdkafka-dev \
4544
librecode-dev \
@@ -60,7 +59,6 @@ ENV BUILD_DEPS \
6059
git
6160

6261
ENV RUN_DEPS \
63-
libaspell15 \
6462
libc-client2007e \
6563
libenchant1c2a \
6664
libfbclient2 \
@@ -293,17 +291,12 @@ RUN set -x \
293291
# ---- Installing PHP Extension: phalcon ----
294292
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
295293
&& cd /tmp/phalcon \
296-
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
294+
&& git checkout $(git describe --abbrev=0 --tags) \
297295
&& cd build && ./install \
298296
&& docker-php-ext-enable phalcon \
299297
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
300298
&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
301299
\
302-
# ---- Installing PHP Extension: pspell ----
303-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
304-
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
305-
&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
306-
\
307300
# ---- Installing PHP Extension: recode ----
308301
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
309302
&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -550,8 +543,6 @@ RUN set -x \
550543
&& php-fpm -m | grep -oiE '^phar$' \
551544
&& php -m | grep -oiE '^posix$' \
552545
&& php-fpm -m | grep -oiE '^posix$' \
553-
&& php -m | grep -oiE '^pspell$' \
554-
&& php-fpm -m | grep -oiE '^pspell$' \
555546
&& php -m | grep -oiE '^readline$' \
556547
&& php-fpm -m | grep -oiE '^readline$' \
557548
&& php -m | grep -oiE '^recode$' \

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ ENV BUILD_DEPS \
3939
libnghttp2-dev \
4040
libpng-dev \
4141
libpq-dev \
42-
libpspell-dev \
4342
librabbitmq-dev \
4443
librdkafka-dev \
4544
librecode-dev \
@@ -60,7 +59,6 @@ ENV BUILD_DEPS \
6059
git
6160

6261
ENV RUN_DEPS \
63-
libaspell15 \
6462
libc-client2007e \
6563
libenchant1c2a \
6664
libfbclient2 \
@@ -294,17 +292,12 @@ RUN set -x \
294292
# ---- Installing PHP Extension: phalcon ----
295293
&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
296294
&& cd /tmp/phalcon \
297-
&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \
295+
&& git checkout $(git describe --abbrev=0 --tags) \
298296
&& cd build && ./install \
299297
&& docker-php-ext-enable phalcon \
300298
&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
301299
&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
302300
\
303-
# ---- Installing PHP Extension: pspell ----
304-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
305-
&& (rm -rf /usr/local/lib/php/test/pspell || true) \
306-
&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
307-
\
308301
# ---- Installing PHP Extension: recode ----
309302
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
310303
&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -551,8 +544,6 @@ RUN set -x \
551544
&& php-fpm -m | grep -oiE '^phar$' \
552545
&& php -m | grep -oiE '^posix$' \
553546
&& php-fpm -m | grep -oiE '^posix$' \
554-
&& php -m | grep -oiE '^pspell$' \
555-
&& php-fpm -m | grep -oiE '^pspell$' \
556547
&& php -m | grep -oiE '^readline$' \
557548
&& php-fpm -m | grep -oiE '^readline$' \
558549
&& php -m | grep -oiE '^recode$' \

‎Dockerfiles/work/Dockerfile-5.2‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ RUN set -x \
2727
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
2828
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
2929
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
30+
curl \
3031
dirmngr \
3132
gnupg \
3233
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
34+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
3435
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
35-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
36+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
3637
&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
37-
&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
38+
&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3839
&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
39-
&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
40+
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4041
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
41-
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
42+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4243
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4344
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4445
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
5152
build-essential \
5253
bzip2 \
5354
coreutils \
54-
curl \
5555
dnsutils \
5656
dos2unix \
5757
file \

‎Dockerfiles/work/Dockerfile-5.3‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ RUN set -x \
2727
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
2828
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
2929
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
30+
curl \
3031
dirmngr \
3132
gnupg \
3233
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
34+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
3435
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
35-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
36+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
3637
&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
37-
&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
38+
&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3839
&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
39-
&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
40+
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4041
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
41-
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
42+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4243
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4344
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4445
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
5152
build-essential \
5253
bzip2 \
5354
coreutils \
54-
curl \
5555
dnsutils \
5656
dos2unix \
5757
file \

‎Dockerfiles/work/Dockerfile-5.4‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ RUN set -x \
2727
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
2828
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
2929
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
30+
curl \
3031
dirmngr \
3132
gnupg \
3233
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
34+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
3435
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
35-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
36+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
3637
&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
37-
&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
38+
&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3839
&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
39-
&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
40+
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4041
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
41-
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
42+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4243
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4344
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4445
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
5152
build-essential \
5253
bzip2 \
5354
coreutils \
54-
curl \
5555
dnsutils \
5656
dos2unix \
5757
file \

‎Dockerfiles/work/Dockerfile-5.5‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ RUN set -x \
2727
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
2828
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
2929
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
30+
curl \
3031
dirmngr \
3132
gnupg \
3233
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
34+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
3435
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
35-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
36+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
3637
&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
37-
&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
38+
&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3839
&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
39-
&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
40+
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4041
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
41-
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
42+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4243
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4344
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4445
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
5152
build-essential \
5253
bzip2 \
5354
coreutils \
54-
curl \
5555
dnsutils \
5656
dos2unix \
5757
file \

‎Dockerfiles/work/Dockerfile-5.6‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,19 @@ RUN set -x \
2727
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
2828
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
2929
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
30+
curl \
3031
dirmngr \
3132
gnupg \
3233
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
33-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
34+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
3435
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
35-
&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
36+
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
3637
&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
37-
&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
38+
&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
3839
&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
39-
&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
40+
&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4041
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
41-
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
42+
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
4243
&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
4344
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4445
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -51,7 +52,6 @@ RUN set -x \
5152
build-essential \
5253
bzip2 \
5354
coreutils \
54-
curl \
5555
dnsutils \
5656
dos2unix \
5757
file \

0 commit comments

Comments
 (0)