Skip to content

Commit 0fb2067

Browse files
tianontianon
authored
Merge pull request matomo-org#101 from J0WI/debian-stretch
Fix compatibility with Debian stretch base
2 parents 5c658b8 + 72bf7cd commit 0fb2067

File tree

4 files changed

+42
-9
lines changed

4 files changed

+42
-9
lines changed

‎Dockerfile-debian.template‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN set -ex; \
1212
libgeoip-dev \
1313
libjpeg-dev \
1414
libldap2-dev \
15-
libpng12-dev \
15+
libpng-dev \
1616
; \
1717
\
1818
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -56,6 +56,15 @@ RUN set -ex; \
5656
ENV MATOMO_VERSION %%VERSION%%
5757

5858
RUN set -ex; \
59+
fetchDeps=" \
60+
dirmngr \
61+
gnupg \
62+
"; \
63+
apt-get update; \
64+
apt-get install -y --no-install-recommends \
65+
$fetchDeps \
66+
; \
67+
\
5968
curl -fsSL -o piwik.tar.gz \
6069
"https://builds.matomo.org/piwik-${MATOMO_VERSION}.tar.gz"; \
6170
curl -fsSL -o piwik.tar.gz.asc \
@@ -65,7 +74,9 @@ RUN set -ex; \
6574
gpg --batch --verify piwik.tar.gz.asc piwik.tar.gz; \
6675
rm -r "$GNUPGHOME" piwik.tar.gz.asc; \
6776
tar -xzf piwik.tar.gz -C /usr/src/; \
68-
rm piwik.tar.gz
77+
rm piwik.tar.gz; \
78+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
79+
rm -rf /var/lib/apt/lists/*
6980

7081
COPY php.ini /usr/local/etc/php/conf.d/php-piwik.ini
7182

‎apache/Dockerfile‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN set -ex; \
1212
libgeoip-dev \
1313
libjpeg-dev \
1414
libldap2-dev \
15-
libpng12-dev \
15+
libpng-dev \
1616
; \
1717
\
1818
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -53,9 +53,18 @@ RUN set -ex; \
5353
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
5454
rm -rf /var/lib/apt/lists/*
5555

56-
ENV MATOMO_VERSION 3.5.0
56+
ENV MATOMO_VERSION 3.5.1
5757

5858
RUN set -ex; \
59+
fetchDeps=" \
60+
dirmngr \
61+
gnupg \
62+
"; \
63+
apt-get update; \
64+
apt-get install -y --no-install-recommends \
65+
$fetchDeps \
66+
; \
67+
\
5968
curl -fsSL -o piwik.tar.gz \
6069
"https://builds.matomo.org/piwik-${MATOMO_VERSION}.tar.gz"; \
6170
curl -fsSL -o piwik.tar.gz.asc \
@@ -65,7 +74,9 @@ RUN set -ex; \
6574
gpg --batch --verify piwik.tar.gz.asc piwik.tar.gz; \
6675
rm -r "$GNUPGHOME" piwik.tar.gz.asc; \
6776
tar -xzf piwik.tar.gz -C /usr/src/; \
68-
rm piwik.tar.gz
77+
rm piwik.tar.gz; \
78+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
79+
rm -rf /var/lib/apt/lists/*
6980

7081
COPY php.ini /usr/local/etc/php/conf.d/php-piwik.ini
7182

‎fpm-alpine/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RUN set -ex; \
4848
apk add --virtual .piwik-phpext-rundeps $runDeps; \
4949
apk del .build-deps
5050

51-
ENV MATOMO_VERSION 3.5.0
51+
ENV MATOMO_VERSION 3.5.1
5252

5353
RUN set -ex; \
5454
apk add --no-cache --virtual .fetch-deps \

‎fpm/Dockerfile‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN set -ex; \
1212
libgeoip-dev \
1313
libjpeg-dev \
1414
libldap2-dev \
15-
libpng12-dev \
15+
libpng-dev \
1616
; \
1717
\
1818
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@@ -53,9 +53,18 @@ RUN set -ex; \
5353
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
5454
rm -rf /var/lib/apt/lists/*
5555

56-
ENV MATOMO_VERSION 3.5.0
56+
ENV MATOMO_VERSION 3.5.1
5757

5858
RUN set -ex; \
59+
fetchDeps=" \
60+
dirmngr \
61+
gnupg \
62+
"; \
63+
apt-get update; \
64+
apt-get install -y --no-install-recommends \
65+
$fetchDeps \
66+
; \
67+
\
5968
curl -fsSL -o piwik.tar.gz \
6069
"https://builds.matomo.org/piwik-${MATOMO_VERSION}.tar.gz"; \
6170
curl -fsSL -o piwik.tar.gz.asc \
@@ -65,7 +74,9 @@ RUN set -ex; \
6574
gpg --batch --verify piwik.tar.gz.asc piwik.tar.gz; \
6675
rm -r "$GNUPGHOME" piwik.tar.gz.asc; \
6776
tar -xzf piwik.tar.gz -C /usr/src/; \
68-
rm piwik.tar.gz
77+
rm piwik.tar.gz; \
78+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
79+
rm -rf /var/lib/apt/lists/*
6980

7081
COPY php.ini /usr/local/etc/php/conf.d/php-piwik.ini
7182

0 commit comments

Comments
 (0)