Skip to content

Commit 3bd49fb

Browse files
committed
Avoid using tabs
Issue #144 Signed-off-by: Michal Čihař <michal@cihar.com>
1 parent d9236df commit 3bd49fb

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

Dockerfile

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@ FROM php:7.2-fpm-alpine
22

33
# Install dependencies
44
RUN apk add --no-cache --virtual .build-deps \
5-
bzip2-dev \
6-
freetype-dev \
7-
libjpeg-turbo-dev \
8-
libpng-dev \
9-
libwebp-dev \
10-
libxpm-dev \
11-
; \
12-
\
13-
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
14-
docker-php-ext-install bz2 gd mysqli opcache zip; \
15-
\
16-
runDeps="$( \
17-
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
18-
| tr ',' '\n' \
19-
| sort -u \
20-
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
21-
)"; \
22-
apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
23-
apk del .build-deps; \
24-
apk add --no-cache nginx supervisor
5+
bzip2-dev \
6+
freetype-dev \
7+
libjpeg-turbo-dev \
8+
libpng-dev \
9+
libwebp-dev \
10+
libxpm-dev \
11+
; \
12+
\
13+
docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
14+
docker-php-ext-install bz2 gd mysqli opcache zip; \
15+
\
16+
runDeps="$( \
17+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
18+
| tr ',' '\n' \
19+
| sort -u \
20+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
21+
)"; \
22+
apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
23+
apk del .build-deps; \
24+
apk add --no-cache nginx supervisor
2525

2626
# Include keyring to verify download
2727
COPY phpmyadmin.keyring /
@@ -40,22 +40,22 @@ LABEL version=$VERSION
4040

4141
# Download tarball, verify it using gpg and extract
4242
RUN set -x \
43-
&& GNUPGHOME="$(mktemp -d)" \
44-
&& export GNUPGHOME \
45-
&& apk add --no-cache curl gnupg \
46-
&& curl --output phpMyAdmin.tar.gz --location $URL \
47-
&& curl --output phpMyAdmin.tar.gz.asc --location $URL.asc \
48-
&& gpgv --keyring /phpmyadmin.keyring phpMyAdmin.tar.gz.asc phpMyAdmin.tar.gz \
49-
&& apk del --no-cache curl gnupg \
50-
&& rm -rf "$GNUPGHOME" \
51-
&& tar xzf phpMyAdmin.tar.gz \
52-
&& rm -f phpMyAdmin.tar.gz phpMyAdmin.tar.gz.asc \
53-
&& mv phpMyAdmin-$VERSION-all-languages /www \
54-
&& rm -rf /www/setup/ /www/examples/ /www/test/ /www/po/ /www/composer.json /www/RELEASE-DATE-$VERSION \
55-
&& sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /www/libraries/vendor_config.php \
56-
&& chown -R root:nobody /www \
57-
&& find /www -type d -exec chmod 750 {} \; \
58-
&& find /www -type f -exec chmod 640 {} \;
43+
&& GNUPGHOME="$(mktemp -d)" \
44+
&& export GNUPGHOME \
45+
&& apk add --no-cache curl gnupg \
46+
&& curl --output phpMyAdmin.tar.gz --location $URL \
47+
&& curl --output phpMyAdmin.tar.gz.asc --location $URL.asc \
48+
&& gpgv --keyring /phpmyadmin.keyring phpMyAdmin.tar.gz.asc phpMyAdmin.tar.gz \
49+
&& apk del --no-cache curl gnupg \
50+
&& rm -rf "$GNUPGHOME" \
51+
&& tar xzf phpMyAdmin.tar.gz \
52+
&& rm -f phpMyAdmin.tar.gz phpMyAdmin.tar.gz.asc \
53+
&& mv phpMyAdmin-$VERSION-all-languages /www \
54+
&& rm -rf /www/setup/ /www/examples/ /www/test/ /www/po/ /www/composer.json /www/RELEASE-DATE-$VERSION \
55+
&& sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /www/libraries/vendor_config.php \
56+
&& chown -R root:nobody /www \
57+
&& find /www -type d -exec chmod 750 {} \; \
58+
&& find /www -type f -exec chmod 640 {} \;
5959

6060
# Add directory for sessions to allow session persistence
6161
RUN mkdir /sessions

0 commit comments

Comments
 (0)