Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v1.1.1 (August 16, 2019)
* Removed d4m guide.
* Updated Laravel docker container to Node10 (previously Node8)
* Updated Yii2/Laravel scripts to leverage "st-internal" network
* Removed all unchanged php.ini files for both Yii2/Laravel

# v1.1.0 (Oct 1, 2018)
* [Breaking] Removed MariaDB10.1
* Added MariaDB10.2
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ The examples make the assumption that any domain used for local development is
already added to the `/etc/hosts` file. You can edit to add `127.0.0.1 domain.docker`.

## Docs
* [Setting up D4M-NFS](docs/d4m-nfs/README.md)
* [Setting up Nginx-Proxy](docs/nginx-proxy/README.md)
* [Setting up PHP Testing in PHPStorm](docs/phpstorm-docker/README.md)
* [Setting up Python Debugging in Pycharm](docs/pycharm-debugging/README.md)
Expand Down
30 changes: 0 additions & 30 deletions docs/d4m-nfs/README.md

This file was deleted.

Binary file removed docs/d4m-nfs/images/docker-file-sharing.png
Binary file not shown.
4 changes: 2 additions & 2 deletions examples/laravel5/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.2-fpm
FROM php:7.2-fpm-stretch

# System dependencies needed
RUN apt-get update && apt-get install -y \
Expand Down Expand Up @@ -46,7 +46,7 @@ RUN curl -o /tmp/composer-setup.php https://getcomposer.org/installer \
&& rm -f /tmp/composer-setup.*

# Node: We should use another container for this, since we are mixing PHP and Node
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
&& apt-get install -y nodejs

# Yarn: Installing
Expand Down
Loading