Skip to content

Commit 440c6ca

Browse files
committed
Unpin packages and make composer install less sha-y
1 parent 916f50a commit 440c6ca

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

Dockerfile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ RUN DEBIAN_FRONTEND=noninteractive \
1212
apt-get clean && \
1313
apt-get -q -y update && \
1414
apt-get -q -y install \
15-
ca-certificates=20141019+deb8u1 php5-fpm=5.6.22+dfsg-0+deb8u1 php5-curl=5.6.22+dfsg-0+deb8u1 \
16-
php5-readline=5.6.22+dfsg-0+deb8u1 php5-mcrypt=5.6.22+dfsg-0+deb8u1 sudo=1.8.10p3-1+deb8u3 \
17-
php5-mysql=5.6.22+dfsg-0+deb8u1 php5-apcu=4.0.7-1 php5-cli=5.6.22+dfsg-0+deb8u1 \
18-
php5-gd=5.6.22+dfsg-0+deb8u1 php5-mysql=5.6.22+dfsg-0+deb8u1 php5-pgsql=5.6.22+dfsg-0+deb8u1 \
19-
php5-sqlite=5.6.22+dfsg-0+deb8u1 wget=1.16-1 sqlite=2.8.17-12 git=1:2.1.4-2.1+deb8u2 \
20-
libsqlite3-dev=3.8.7.1-1+deb8u1 postgresql-client=9.4+165+deb8u1 mysql-client=5.5.49-0+deb8u1 \
21-
supervisor=3.0r1-1 cron=3.0pl1-127+deb8u1 && \
15+
ca-certificates php5-fpm php5-curl \
16+
php5-readline php5-mcrypt sudo \
17+
php5-mysql php5-apcu php5-cli \
18+
php5-gd php5-mysql php5-pgsql \
19+
php5-sqlite wget sqlite git \
20+
libsqlite3-dev postgresql-client mysql-client \
21+
supervisor cron && \
2222
apt-get clean && apt-get autoremove -q && \
2323
rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man /tmp/*
2424

@@ -42,9 +42,10 @@ WORKDIR /var/www/html/
4242
USER www-data
4343

4444
# Install composer
45-
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
46-
php -r "if (hash_file('SHA384', 'composer-setup.php') === 'e115a8dc7871f15d853148a7fbac7da27d6c0030b848d9b3dc09e2a0388afed865e6a3d6b3c0fad45c48e2b5fc1196ae') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
47-
php composer-setup.php --version=1.1.2 && \
45+
RUN php -r "copy('https://getcomposer.org/installer', '/tmp/composer-setup.php');" && \
46+
php -r "copy('https://composer.github.io/installer.sig', '/tmp/composer-setup.sig');" && \
47+
php -r "if (hash('SHA384', file_get_contents('/tmp/composer-setup.php')) !== trim(file_get_contents('/tmp/composer-setup.sig'))) { unlink('/tmp/composer-setup.php'); echo 'Invalid installer' . PHP_EOL; exit(1); }" && \
48+
php /tmp/composer-setup.php --version=1.1.2 && \
4849
php -r "unlink('composer-setup.php');"
4950

5051
RUN wget https://github.com/cachethq/Cachet/archive/${cachet_ver}.tar.gz && \

0 commit comments

Comments
 (0)