Skip to content

Commit 6231b30

Browse files
committed
Merge branch 'php7dot4' into php8dot0
2 parents 8ab4c7d + 14e5f97 commit 6231b30

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ENV XDEBUG_REMOTE_PORT=9000
2121
ENV PHP_EXTENSION_WDDX=1
2222
ENV PHP_OPENSSL=1
2323

24-
ENV CONTAINER_STARTED_LOCK=/var/lock/container.started
24+
ENV CONTAINER_STARTED_LOCK=/var/lock/container.starting
2525

2626
RUN apt-get update && apt-get install -y --no-install-recommends wget vim supervisor libfreetype6-dev libjpeg-dev libjpeg62-turbo-dev \
2727
libmcrypt-dev libpng-dev libssl-dev libaio1 git libcurl4-openssl-dev libxslt-dev \
@@ -91,7 +91,7 @@ COPY configs/php-errors.ini /usr/local/etc/php/conf.d/php-errors.ini
9191
COPY apache-run.sh /usr/bin/apache-run
9292
COPY ./bin /usr/bin/
9393

94-
RUN touch /usr/bin/post-startup-hook && chmod a+x \
94+
RUN chmod a+x \
9595
/usr/bin/apache-run \
9696
/usr/bin/xdebug-set-mode \
9797
/usr/bin/post-startup-hook

bin/opcache-setup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22

33
if [[ ${OPCACHE_ENABLED} == true ]]; then
4-
echo "opcache.enable=1" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
4+
echo "opcache.enable=1" | tee -a /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
55
echo "opcache.max_accelerated_files=$(echo $[ 1000 + $(find . -type f -name "*.php" | wc -l) ])" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
66
else
7-
echo "opcache.enable=0" >> /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
7+
echo "opcache.enable=0" | tee -a /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
88
fi

bin/post-startup-hook

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
3+
# substituir pelas ações necessárias após o startup base

0 commit comments

Comments
 (0)