Skip to content

Commit 6468633

Browse files
committed
Cleanup workspace & reconfigure
1 parent 462f0bc commit 6468633

9 files changed

+0
-419
lines changed

Dockerfile

-27
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ FROM dockerframework/phpfpm:5.6
2121

2222
MAINTAINER "Laradock Team <[email protected]>"
2323

24-
ENV PHP_VERSION=5.6.35 \
25-
ALPINE_VERSION=3.4 \
26-
XDEBUG_VERSION=2.5.5
27-
2824
ENV NODE_VERSION=6.14.2
2925
RUN addgroup -g 1000 node \
3026
&& adduser -u 1000 -G node -s /bin/sh -D node \
@@ -88,29 +84,6 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
8884
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
8985
&& apk del .build-deps-yarn
9086

91-
COPY ./docker-php-pecl-install /usr/local/bin/
92-
RUN apk add --no-cache $PHPIZE_DEPS \
93-
libmcrypt-dev \
94-
libltdl \
95-
zlib \
96-
icu-dev \
97-
g++ \
98-
gettext \
99-
curl-dev \
100-
openssl-dev \
101-
libcurl \
102-
&& pecl install xdebug-${XDEBUG_VERSION}
103-
104-
105-
COPY docker-php-source /usr/local/bin/
106-
COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
107-
RUN docker-php-ext-enable opcache
108-
109-
RUN mkdir -p /var/log/php-fpm \
110-
&& mkdir -p /var/www/html \
111-
&& touch /var/log/php-fpm/fpm-error.log \
112-
&& chmod 777 /var/log/php-fpm/fpm-error.log
113-
11487
ENTRYPOINT ["docker-php-entrypoint"]
11588
WORKDIR /var/www/html
11689

docker-compose.skeleton.yml

-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,5 @@ services:
2525
- ${VENDOR_PHP_CS_FIXER}:/usr/local/bin/php-cs-fixer # vendor php-cs-fixer
2626
- ${WORKSPACE}:/var/www/html # volume for data
2727
environment:
28-
- ALPINE_VERSION=${ALPINE_VERSION}
29-
- PHP_VERSION=${PHP_VERSION}
30-
- XDEBUG_VERSION=${XDEBUG_VERSION}
31-
- DEBUG=1
3228
- NODE_VERSION=${NODE_VERSION}
3329
- YARN_VERSION=${YARN_VERSION}

docker-compose.yml

-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,5 @@ services:
2323
- ./vendor/php-cs-fixer:/usr/local/bin/php-cs-fixer # vendor php-cs-fixer
2424
- ./data/laradock:/var/www/html # volume for data
2525
environment:
26-
- ALPINE_VERSION=3.4
27-
- PHP_VERSION=5.6.35
28-
- XDEBUG_VERSION=2.5.5
29-
- DEBUG=1
3026
- NODE_VERSION=6.14.2
3127
- YARN_VERSION=1.6.0

docker-php-entrypoint

-9
This file was deleted.

docker-php-ext-configure

-69
This file was deleted.

docker-php-ext-enable

-114
This file was deleted.

docker-php-ext-install

-122
This file was deleted.

0 commit comments

Comments
 (0)