Skip to content

Commit a03888e

Browse files
authored
Merge pull request #20 from pacoorozco/fix-web-docker
Fix web docker
2 parents 747b4bd + de9980f commit a03888e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
55

66
## Unreleased
7+
### Fixed
8+
- Fix `web` docker configuration in order to allow `docker-compose` run. ([#18][i18])
79

8-
## 0.5.0 - 2018-08-10
10+
[i18]: https://github.com/pacoorozco/ssham/issues/18
911

12+
## 0.5.0 - 2018-08-10
1013

1114
## 0.4.0 - 2017-07-29
1215
### Changed

docker/web/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ COPY ./docker/web/nginx.conf /etc/nginx/
77
RUN apk update \
88
&& apk upgrade \
99
&& apk add --no-cache bash \
10-
&& adduser -D -H -u 1000 -s /bin/bash www-data
10+
&& adduser -S www-data -G www-data -u 1000
1111

1212
ARG PHP_UPSTREAM_CONTAINER=app
1313
ARG PHP_UPSTREAM_PORT=9000

0 commit comments

Comments
 (0)