Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added php7.2 and php 7.3 #9

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

added php7.2 and php 7.3 #9

wants to merge 10 commits into from

Conversation

tomtomsen
Copy link

ADD added /root/.composer/vendor/bin to PATH
MOD PEAR: phing package deprecated install via composer
MOD sed command failed.
MOD nginx-site.conf moved to /etc/nginx/conf.d/ instead of /etc/nginx/sites-enabled/default
DEL removed mcrypt for php7.2 and php7.3 deprecated

Markus Bandion added 3 commits December 27, 2018 11:05
ADD added /root/.composer/vendor/bin to PATH
MOD PEAR: phing package depcrecated install via composer
MOD sed command failed.
MOD nginx-site.conf moved to /etc/nginx/conf.d/ instead of
/etc/nginx/sites-enabled/default
DEL removed mcrypt for php7.2 and php7.3 deprecated
generate.sh Outdated Show resolved Hide resolved
@@ -125,13 +145,13 @@ for version in "${versions[@]}"; do
&& ln -sf /dev/stderr /var/log/nginx/error.log

COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY nginx-site.conf /etc/nginx/sites-enabled/default
COPY nginx-site.conf /etc/nginx/conf.d/default.conf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please leave /etc/nginx/sites-enabled/default - images using this base image rely on sites-enabled/default and remove conf.d/default.conf ... having sites-enabled/ is also the Ubuntu default for nginx.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've looked into it: the nginx version which is used here, does not have a sites-enabled directory.
based on this post What is the different usages for sites-available vs the conf.d directory for nginx, i think the current approch is good.

if you insist in having a sites-enabled directory, we have to sed the nginx.conf which will probably fail in future (if it gets modified)

generate.sh Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants