Skip to content

Commit

Permalink
fix dev images
Browse files Browse the repository at this point in the history
  • Loading branch information
htuscher committed Dec 4, 2020
1 parent 0853862 commit 26b67ef
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 8 deletions.
3 changes: 2 additions & 1 deletion docker/php-apache-dev/8.0-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"

COPY conf/ /opt/docker/

RUN set -x \# Install development environment
RUN set -x \
# Install development environment
&& wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
&& mv blackfire-agent /usr/local/bin/ \
&& chmod +x /usr/local/bin/blackfire-agent \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
{{ docker.copy('conf/', '/opt/docker/') }}

RUN set -x \
{{- php.officialDevelopmentAlpine(version="8.0") }} \
{{ php.officialDevelopmentAlpine(version="8.0") }} \
{{ provision.runBootstrap() }} \
{{ docker.cleanup() }}
3 changes: 2 additions & 1 deletion docker/php-apache-dev/8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"

COPY conf/ /opt/docker/

RUN set -x \# Install development environment
RUN set -x \
# Install development environment
&& wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
&& echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-install \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-apache-dev/8.0/Dockerfile.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
{{ docker.copy('conf/', '/opt/docker/') }}

RUN set -x \
{{- php.officialDevelopment(version="8.0") }} \
{{ php.officialDevelopment(version="8.0") }} \
{{ provision.runBootstrap() }} \
{{ docker.cleanup() }}
3 changes: 2 additions & 1 deletion docker/php-nginx-dev/8.0-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"

COPY conf/ /opt/docker/

RUN set -x \# Install development environment
RUN set -x \
# Install development environment
&& wget -q -O blackfire-agent https://packages.blackfire.io/binaries/blackfire-agent/1.34.0/blackfire-agent-linux_static_amd64 \
&& mv blackfire-agent /usr/local/bin/ \
&& chmod +x /usr/local/bin/blackfire-agent \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
{{ docker.copy('conf/', '/opt/docker/') }}

RUN set -x \
{{- php.officialDevelopmentAlpine(version="8.0") }} \
{{ php.officialDevelopmentAlpine(version="8.0") }} \
{{ provision.runBootstrap() }} \
{{ docker.cleanup() }}
3 changes: 2 additions & 1 deletion docker/php-nginx-dev/8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ ENV WEB_NO_CACHE_PATTERN="\.(css|js|gif|png|jpg|svg|json|xml)$"

COPY conf/ /opt/docker/

RUN set -x \# Install development environment
RUN set -x \
# Install development environment
&& wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - \
&& echo "deb https://packages.blackfire.io/debian any main" | tee /etc/apt/sources.list.d/blackfire.list \
&& apt-install \
Expand Down
2 changes: 1 addition & 1 deletion docker/php-nginx-dev/8.0/Dockerfile.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
{{ docker.copy('conf/', '/opt/docker/') }}

RUN set -x \
{{- php.officialDevelopment(version="8.0") }} \
{{ php.officialDevelopment(version="8.0") }} \
{{ provision.runBootstrap() }} \
{{ docker.cleanup() }}

0 comments on commit 26b67ef

Please sign in to comment.