Skip to content

Commit a049c05

Browse files
docker-compose fixes
- Swapped package `libpng12-dev` with `libpng-dev` in PHP Dockerfile - Fixed path of `sprinkles.example.json` and `sprinkles.json` in README.md
1 parent 95ad1f6 commit a049c05

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## [Unreleased]
9+
### Fixed
10+
- Corrected Docker `README.md` to refer to updated `sprinkles.json` and `sprinkles.example.json` locations.
11+
- Replaced `libpng12-dev` which has been dropped since Ubuntu 16.04 with `libpng-dev` in PHP `Dockerfile`.
12+
813
## v4.1.21
914
- Locked Whoops to version 2.2.1 until they fix that [`[internal]` issue](https://github.com/filp/whoops/issues/598).
1015

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ First, install [Docker Compose](https://docs.docker.com/compose/install/).
44

55
Second, initialize a new UserFrosting project:
66

7-
1. Copy `app/sprinkles/sprinkles.example.json` to `app/sprinkles/sprinkles.json`
7+
1. Copy `app/sprinkles.example.json` to `app/sprinkles.json`
88
2. Run `chmod 777 app/{logs,cache,sessions}` to fix file permissions for web server. (NOTE: File
99
permissions should be properly secured in a production environment!)
1010
2. Run `docker-compose run composer install` to install all composer modules.

docker/php/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM php:7.0-fpm
22
RUN apt-get update && apt-get install -y \
33
libfreetype6-dev \
44
libjpeg62-turbo-dev \
5-
libpng12-dev \
5+
libpng-dev \
66
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
77
&& docker-php-ext-install -j$(nproc) gd \
88
&& docker-php-ext-install -j$(nproc) pdo pdo_mysql

0 commit comments

Comments
 (0)