Skip to content

Commit e12618d

Browse files
author
Julien Neuhart
committed
removing default apache2 PHP conf
1 parent 78c2693 commit e12618d

File tree

6 files changed

+15
-12
lines changed

6 files changed

+15
-12
lines changed

Dockerfile.slim.apache

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
6969

7070
ENV TEMPLATE_PHP_INI=development
7171

72-
# Let's remove the default php.ini file (it will be copied from TEMPLATE_PHP_INI)
73-
RUN rm /etc/php/${PHP_VERSION}/cli/php.ini
72+
# Let's remove the default php.ini files (they will be copied from TEMPLATE_PHP_INI)
73+
RUN rm /etc/php/${PHP_VERSION}/cli/php.ini &&\
74+
rm /etc/php/${PHP_VERSION}/apache2/php.ini
7475

7576

7677
# |--------------------------------------------------------------------------
@@ -311,7 +312,7 @@ CMD ["apache2-foreground"]
311312
# | Entrypoint
312313
# |--------------------------------------------------------------------------
313314
# |
314-
# | Defines Apache user. Bu default, we switch this to "docker" user.
315+
# | Defines Apache user. By default, we switch this to "docker" user.
315316
# | This way, no problem to write from Apache in the current working directory.
316317
# | Important! This should be changed back to www-data in production.
317318
# |

Dockerfile.slim.cli

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
6969

7070
ENV TEMPLATE_PHP_INI=development
7171

72-
# Let's remove the default php.ini file (it will be copied from TEMPLATE_PHP_INI)
73-
RUN rm /etc/php/${PHP_VERSION}/cli/php.ini
72+
# Let's remove the default php.ini files (they will be copied from TEMPLATE_PHP_INI)
73+
RUN rm /etc/php/${PHP_VERSION}/cli/php.ini &&\
74+
rm /etc/php/${PHP_VERSION}/apache2/php.ini
7475

7576

7677
# |--------------------------------------------------------------------------

Dockerfile.slim.fpm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
6969

7070
ENV TEMPLATE_PHP_INI=development
7171

72-
# Let's remove the default php.ini file (it will be copied from TEMPLATE_PHP_INI)
73-
RUN rm /etc/php/${PHP_VERSION}/cli/php.ini
72+
# Let's remove the default php.ini files (they will be copied from TEMPLATE_PHP_INI)
73+
RUN rm /etc/php/${PHP_VERSION}/cli/php.ini &&\
74+
rm /etc/php/${PHP_VERSION}/apache2/php.ini
7475

7576

7677
# |--------------------------------------------------------------------------

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2018 TheCodingMachine
3+
Copyright (c) 2020 TheCodingMachine
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

orbit.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,4 @@ tasks:
3434
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node8 -p "variant,fpm;node_version,8"
3535
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node10 -p "variant,fpm;node_version,10"
3636
- orbit generate -f utils/Dockerfile.node.blueprint -o Dockerfile.fpm.node12 -p "variant,fpm;node_version,12"
37-
3837
- orbit generate -f utils/README.blueprint.md -o README.md

utils/Dockerfile.slim.blueprint

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
7171

7272
ENV TEMPLATE_PHP_INI=development
7373

74-
# Let's remove the default php.ini file (it will be copied from TEMPLATE_PHP_INI)
75-
RUN rm /etc/php/${PHP_VERSION}/cli/php.ini
74+
# Let's remove the default php.ini files (they will be copied from TEMPLATE_PHP_INI)
75+
RUN rm /etc/php/${PHP_VERSION}/cli/php.ini &&\
76+
rm /etc/php/${PHP_VERSION}/apache2/php.ini
7677

7778

7879
# |--------------------------------------------------------------------------
@@ -323,7 +324,7 @@ CMD ["apache2-foreground"]
323324
# | Entrypoint
324325
# |--------------------------------------------------------------------------
325326
# |
326-
# | Defines Apache user. Bu default, we switch this to "docker" user.
327+
# | Defines Apache user. By default, we switch this to "docker" user.
327328
# | This way, no problem to write from Apache in the current working directory.
328329
# | Important! This should be changed back to www-data in production.
329330
# |

0 commit comments

Comments
 (0)