Skip to content

Debian 8 with working PHP7 #96

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 14, 2016
Merged

Debian 8 with working PHP7 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/php-dev/debian-8-php7/Dockerfile.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

{{ docker.copy('conf/', '/opt/docker/') }}

{{ php7dev.debianDotDeb() }}
{{ php7dev.debianSury() }}
16 changes: 13 additions & 3 deletions docker/php/debian-8-php7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,19 @@ ENV WEB_ALIAS_DOMAIN *.vm
COPY conf/ /opt/docker/

# Install php environment
RUN echo "deb http://packages.dotdeb.org jessie all" >> /etc/apt/sources.list \
&& echo "deb-src http://packages.dotdeb.org jessie all" >> /etc/apt/sources.list \
&& wget -O- https://www.dotdeb.org/dotdeb.gpg | apt-key add - \
RUN /usr/local/bin/apt-install apt-transport-https lsb-release \
&& echo "deb https://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list \
&& echo "deb http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \
&& echo "deb-src http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \
&& wget -O- https://packages.sury.org/php/apt.gpg | apt-key add - \
&& echo "Package: *" > /etc/apt/preferences.d/debian_testing.pref \
&& echo "Pin: origin ftp2.de.debian.org" >> /etc/apt/preferences.d/debian_testing.pref \
&& echo "Pin-Priority: -10" >> /etc/apt/preferences.d/debian_testing.pref \
&& echo "Package: libpcre3" > /etc/apt/preferences.d/libpcre.pref \
&& echo "Pin: release a=testing" >> /etc/apt/preferences.d/libpcre.pref \
&& echo "Pin-Priority: 995" >> /etc/apt/preferences.d/libpcre.pref \
&& apt-get update \
&& apt-get -t testing install -y -f libpcre3 \
&& /usr/local/bin/apt-install \
# Install tools
imagemagick \
Expand Down
2 changes: 1 addition & 1 deletion docker/php/debian-8-php7/Dockerfile.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

{{ docker.copy('conf/', '/opt/docker/') }}

{{ php7.debianDotDeb('jessie') }}
{{ php7.debianSury('jessie') }}

{{ docker.expose('9000') }}
5 changes: 2 additions & 3 deletions template/Dockerfile/images/php7-dev.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,16 @@ RUN /usr/local/bin/apt-install \
{{ provision.runRoleInline('php-dev', role) }}
{%- endmacro %}

{% macro debianDotDeb(role='') -%}
{% macro debianSury(role='') -%}
# Install development environment
RUN /usr/local/bin/apt-install \
# Install tools
graphviz \
# Install php development stuff
php7.0-xdebug \
# php7.0-xdebug \ # Is currently not available
{{ provision.runRoleInline('php-dev', role) }}
{%- endmacro %}


{% macro ubuntu(role='') -%}
# Install development environment
RUN /usr/local/bin/apt-install \
Expand Down
21 changes: 14 additions & 7 deletions template/Dockerfile/images/php7.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,20 @@ RUN /usr/local/bin/apk-install \
{{ provision.runRoleInline('php', role) }}
{%- endmacro %}


{% macro debianDotDeb(distribution,role='') -%}
# Install php environment
RUN echo "deb http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sources.list \
&& echo "deb-src http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sources.list \
&& wget -O- https://www.dotdeb.org/dotdeb.gpg | apt-key add - \
{% macro debianSury(distribution,role='') -%}
RUN /usr/local/bin/apt-install apt-transport-https lsb-release \
&& echo "deb https://packages.sury.org/php/ {{ distribution }} main" >> /etc/apt/sources.list \
&& echo "deb http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \
&& echo "deb-src http://ftp2.de.debian.org/debian/ testing main" >> /etc/apt/sources.list \
&& wget -O- https://packages.sury.org/php/apt.gpg | apt-key add - \
&& echo "Package: *" > /etc/apt/preferences.d/debian_testing.pref \
&& echo "Pin: origin ftp2.de.debian.org" >> /etc/apt/preferences.d/debian_testing.pref \
&& echo "Pin-Priority: -10" >> /etc/apt/preferences.d/debian_testing.pref \
&& echo "Package: libpcre3" > /etc/apt/preferences.d/libpcre.pref \
&& echo "Pin: release a=testing" >> /etc/apt/preferences.d/libpcre.pref \
&& echo "Pin-Priority: 995" >> /etc/apt/preferences.d/libpcre.pref \
&& apt-get update \
&& apt-get -t testing install -y -f libpcre3 \
&& /usr/local/bin/apt-install \
# Install tools
imagemagick \
Expand All @@ -94,7 +102,6 @@ RUN echo "deb http://packages.dotdeb.org {{ distribution }} all" >> /etc/apt/sou
{{ provision.runRoleInline('php', role) }}
{%- endmacro %}


{% macro debian9(role='') -%}
# Install php environment
RUN /usr/local/bin/apt-install \
Expand Down