Skip to content

Commit e1a4aff

Browse files
TimWollaTimWolla
committed
Install libargon2 from sid
see: #677 (comment) see: https://travis-ci.org/docker-library/php/jobs/411259094
1 parent a3f5e09 commit e1a4aff

File tree

9 files changed

+63
-81
lines changed

9 files changed

+63
-81
lines changed

‎7.2/stretch/apache/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ RUN set -eux; \
1717

1818
RUN set -eux; \
1919
{ \
20-
echo 'deb http://deb.debian.org/debian buster main'; \
21-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
22-
echo 'deb http://security.debian.org buster/updates main'; \
20+
echo 'deb http://deb.debian.org/debian sid main'; \
2321
} >> /etc/apt/sources.list; \
2422
{ \
2523
echo 'Package: *'; \
26-
echo 'Pin: release n=buster'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 100'; \
28-
} > /etc/apt/preferences.d/no-buster; \
26+
} > /etc/apt/preferences.d/no-sid; \
2927
{ \
30-
echo 'Package: libargon2-0*'; \
31-
echo 'Pin: release n=buster'; \
28+
echo 'Package: libargon2*'; \
29+
echo 'Pin: release n=sid'; \
3230
echo 'Pin-Priority: 990'; \
33-
} > /etc/apt/preferences.d/argon-buster
31+
} > /etc/apt/preferences.d/argon-sid
3432

3533
# dependencies required for running "phpize"
3634
# (see persistent deps below)
@@ -181,7 +179,7 @@ RUN set -eux; \
181179
savedAptMark="$(apt-mark showmanual)"; \
182180
apt-get update; \
183181
apt-get install -y --no-install-recommends \
184-
libargon2-0-dev \
182+
libargon2-dev \
185183
libcurl4-openssl-dev \
186184
libedit-dev \
187185
libsodium-dev \

‎7.2/stretch/cli/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ RUN set -eux; \
1717

1818
RUN set -eux; \
1919
{ \
20-
echo 'deb http://deb.debian.org/debian buster main'; \
21-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
22-
echo 'deb http://security.debian.org buster/updates main'; \
20+
echo 'deb http://deb.debian.org/debian sid main'; \
2321
} >> /etc/apt/sources.list; \
2422
{ \
2523
echo 'Package: *'; \
26-
echo 'Pin: release n=buster'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 100'; \
28-
} > /etc/apt/preferences.d/no-buster; \
26+
} > /etc/apt/preferences.d/no-sid; \
2927
{ \
30-
echo 'Package: libargon2-0*'; \
31-
echo 'Pin: release n=buster'; \
28+
echo 'Package: libargon2*'; \
29+
echo 'Pin: release n=sid'; \
3230
echo 'Pin-Priority: 990'; \
33-
} > /etc/apt/preferences.d/argon-buster
31+
} > /etc/apt/preferences.d/argon-sid
3432

3533
# dependencies required for running "phpize"
3634
# (see persistent deps below)
@@ -122,7 +120,7 @@ RUN set -eux; \
122120
savedAptMark="$(apt-mark showmanual)"; \
123121
apt-get update; \
124122
apt-get install -y --no-install-recommends \
125-
libargon2-0-dev \
123+
libargon2-dev \
126124
libcurl4-openssl-dev \
127125
libedit-dev \
128126
libsodium-dev \

‎7.2/stretch/fpm/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ RUN set -eux; \
1717

1818
RUN set -eux; \
1919
{ \
20-
echo 'deb http://deb.debian.org/debian buster main'; \
21-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
22-
echo 'deb http://security.debian.org buster/updates main'; \
20+
echo 'deb http://deb.debian.org/debian sid main'; \
2321
} >> /etc/apt/sources.list; \
2422
{ \
2523
echo 'Package: *'; \
26-
echo 'Pin: release n=buster'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 100'; \
28-
} > /etc/apt/preferences.d/no-buster; \
26+
} > /etc/apt/preferences.d/no-sid; \
2927
{ \
30-
echo 'Package: libargon2-0*'; \
31-
echo 'Pin: release n=buster'; \
28+
echo 'Package: libargon2*'; \
29+
echo 'Pin: release n=sid'; \
3230
echo 'Pin-Priority: 990'; \
33-
} > /etc/apt/preferences.d/argon-buster
31+
} > /etc/apt/preferences.d/argon-sid
3432

3533
# dependencies required for running "phpize"
3634
# (see persistent deps below)
@@ -123,7 +121,7 @@ RUN set -eux; \
123121
savedAptMark="$(apt-mark showmanual)"; \
124122
apt-get update; \
125123
apt-get install -y --no-install-recommends \
126-
libargon2-0-dev \
124+
libargon2-dev \
127125
libcurl4-openssl-dev \
128126
libedit-dev \
129127
libsodium-dev \

‎7.2/stretch/zts/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ RUN set -eux; \
1717

1818
RUN set -eux; \
1919
{ \
20-
echo 'deb http://deb.debian.org/debian buster main'; \
21-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
22-
echo 'deb http://security.debian.org buster/updates main'; \
20+
echo 'deb http://deb.debian.org/debian sid main'; \
2321
} >> /etc/apt/sources.list; \
2422
{ \
2523
echo 'Package: *'; \
26-
echo 'Pin: release n=buster'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 100'; \
28-
} > /etc/apt/preferences.d/no-buster; \
26+
} > /etc/apt/preferences.d/no-sid; \
2927
{ \
30-
echo 'Package: libargon2-0*'; \
31-
echo 'Pin: release n=buster'; \
28+
echo 'Package: libargon2*'; \
29+
echo 'Pin: release n=sid'; \
3230
echo 'Pin-Priority: 990'; \
33-
} > /etc/apt/preferences.d/argon-buster
31+
} > /etc/apt/preferences.d/argon-sid
3432

3533
# dependencies required for running "phpize"
3634
# (see persistent deps below)
@@ -123,7 +121,7 @@ RUN set -eux; \
123121
savedAptMark="$(apt-mark showmanual)"; \
124122
apt-get update; \
125123
apt-get install -y --no-install-recommends \
126-
libargon2-0-dev \
124+
libargon2-dev \
127125
libcurl4-openssl-dev \
128126
libedit-dev \
129127
libsodium-dev \

‎7.3-rc/stretch/apache/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ RUN set -eux; \
1717

1818
RUN set -eux; \
1919
{ \
20-
echo 'deb http://deb.debian.org/debian buster main'; \
21-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
22-
echo 'deb http://security.debian.org buster/updates main'; \
20+
echo 'deb http://deb.debian.org/debian sid main'; \
2321
} >> /etc/apt/sources.list; \
2422
{ \
2523
echo 'Package: *'; \
26-
echo 'Pin: release n=buster'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 100'; \
28-
} > /etc/apt/preferences.d/no-buster; \
26+
} > /etc/apt/preferences.d/no-sid; \
2927
{ \
30-
echo 'Package: libargon2-0*'; \
31-
echo 'Pin: release n=buster'; \
28+
echo 'Package: libargon2*'; \
29+
echo 'Pin: release n=sid'; \
3230
echo 'Pin-Priority: 990'; \
33-
} > /etc/apt/preferences.d/argon-buster
31+
} > /etc/apt/preferences.d/argon-sid
3432

3533
# dependencies required for running "phpize"
3634
# (see persistent deps below)
@@ -181,7 +179,7 @@ RUN set -eux; \
181179
savedAptMark="$(apt-mark showmanual)"; \
182180
apt-get update; \
183181
apt-get install -y --no-install-recommends \
184-
libargon2-0-dev \
182+
libargon2-dev \
185183
libcurl4-openssl-dev \
186184
libedit-dev \
187185
libsodium-dev \

‎7.3-rc/stretch/cli/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ RUN set -eux; \
1717

1818
RUN set -eux; \
1919
{ \
20-
echo 'deb http://deb.debian.org/debian buster main'; \
21-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
22-
echo 'deb http://security.debian.org buster/updates main'; \
20+
echo 'deb http://deb.debian.org/debian sid main'; \
2321
} >> /etc/apt/sources.list; \
2422
{ \
2523
echo 'Package: *'; \
26-
echo 'Pin: release n=buster'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 100'; \
28-
} > /etc/apt/preferences.d/no-buster; \
26+
} > /etc/apt/preferences.d/no-sid; \
2927
{ \
30-
echo 'Package: libargon2-0*'; \
31-
echo 'Pin: release n=buster'; \
28+
echo 'Package: libargon2*'; \
29+
echo 'Pin: release n=sid'; \
3230
echo 'Pin-Priority: 990'; \
33-
} > /etc/apt/preferences.d/argon-buster
31+
} > /etc/apt/preferences.d/argon-sid
3432

3533
# dependencies required for running "phpize"
3634
# (see persistent deps below)
@@ -122,7 +120,7 @@ RUN set -eux; \
122120
savedAptMark="$(apt-mark showmanual)"; \
123121
apt-get update; \
124122
apt-get install -y --no-install-recommends \
125-
libargon2-0-dev \
123+
libargon2-dev \
126124
libcurl4-openssl-dev \
127125
libedit-dev \
128126
libsodium-dev \

‎7.3-rc/stretch/fpm/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ RUN set -eux; \
1717

1818
RUN set -eux; \
1919
{ \
20-
echo 'deb http://deb.debian.org/debian buster main'; \
21-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
22-
echo 'deb http://security.debian.org buster/updates main'; \
20+
echo 'deb http://deb.debian.org/debian sid main'; \
2321
} >> /etc/apt/sources.list; \
2422
{ \
2523
echo 'Package: *'; \
26-
echo 'Pin: release n=buster'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 100'; \
28-
} > /etc/apt/preferences.d/no-buster; \
26+
} > /etc/apt/preferences.d/no-sid; \
2927
{ \
30-
echo 'Package: libargon2-0*'; \
31-
echo 'Pin: release n=buster'; \
28+
echo 'Package: libargon2*'; \
29+
echo 'Pin: release n=sid'; \
3230
echo 'Pin-Priority: 990'; \
33-
} > /etc/apt/preferences.d/argon-buster
31+
} > /etc/apt/preferences.d/argon-sid
3432

3533
# dependencies required for running "phpize"
3634
# (see persistent deps below)
@@ -123,7 +121,7 @@ RUN set -eux; \
123121
savedAptMark="$(apt-mark showmanual)"; \
124122
apt-get update; \
125123
apt-get install -y --no-install-recommends \
126-
libargon2-0-dev \
124+
libargon2-dev \
127125
libcurl4-openssl-dev \
128126
libedit-dev \
129127
libsodium-dev \

‎7.3-rc/stretch/zts/Dockerfile‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,18 @@ RUN set -eux; \
1717

1818
RUN set -eux; \
1919
{ \
20-
echo 'deb http://deb.debian.org/debian buster main'; \
21-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
22-
echo 'deb http://security.debian.org buster/updates main'; \
20+
echo 'deb http://deb.debian.org/debian sid main'; \
2321
} >> /etc/apt/sources.list; \
2422
{ \
2523
echo 'Package: *'; \
26-
echo 'Pin: release n=buster'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 100'; \
28-
} > /etc/apt/preferences.d/no-buster; \
26+
} > /etc/apt/preferences.d/no-sid; \
2927
{ \
30-
echo 'Package: libargon2-0*'; \
31-
echo 'Pin: release n=buster'; \
28+
echo 'Package: libargon2*'; \
29+
echo 'Pin: release n=sid'; \
3230
echo 'Pin-Priority: 990'; \
33-
} > /etc/apt/preferences.d/argon-buster
31+
} > /etc/apt/preferences.d/argon-sid
3432

3533
# dependencies required for running "phpize"
3634
# (see persistent deps below)
@@ -123,7 +121,7 @@ RUN set -eux; \
123121
savedAptMark="$(apt-mark showmanual)"; \
124122
apt-get update; \
125123
apt-get install -y --no-install-recommends \
126-
libargon2-0-dev \
124+
libargon2-dev \
127125
libcurl4-openssl-dev \
128126
libedit-dev \
129127
libsodium-dev \

‎Dockerfile-debian.template‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,18 @@ RUN set -eux; \
1212
# Argon2-Start
1313
RUN set -eux; \
1414
{ \
15-
echo 'deb http://deb.debian.org/debian buster main'; \
16-
echo 'deb http://deb.debian.org/debian buster-updates main'; \
17-
echo 'deb http://security.debian.org buster/updates main'; \
15+
echo 'deb http://deb.debian.org/debian sid main'; \
1816
} >> /etc/apt/sources.list; \
1917
{ \
2018
echo 'Package: *'; \
21-
echo 'Pin: release n=buster'; \
19+
echo 'Pin: release n=sid'; \
2220
echo 'Pin-Priority: 100'; \
23-
} > /etc/apt/preferences.d/no-buster; \
21+
} > /etc/apt/preferences.d/no-sid; \
2422
{ \
25-
echo 'Package: libargon2-0*'; \
26-
echo 'Pin: release n=buster'; \
23+
echo 'Package: libargon2*'; \
24+
echo 'Pin: release n=sid'; \
2725
echo 'Pin-Priority: 990'; \
28-
} > /etc/apt/preferences.d/argon-buster
26+
} > /etc/apt/preferences.d/argon-sid
2927
# Argon2-End
3028

3129
# dependencies required for running "phpize"
@@ -119,7 +117,7 @@ RUN set -eux; \
119117
apt-get update; \
120118
apt-get install -y --no-install-recommends \
121119
# Argon2-Start
122-
libargon2-0-dev \
120+
libargon2-dev \
123121
# Argon2-End
124122
libcurl4-openssl-dev \
125123
libedit-dev \

0 commit comments

Comments
 (0)