forked from RSS-Bridge/rss-bridge
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Docker] Switch Docker Image to official php base image (RSS-Bridge#1140
) * Switch Docker Image to official php base image Switch from the unofficial Alpine+php image to the official php-apache image. This has 2 advantages: 1. Official image is guaranteed to have regular updates, etc 2. The persistent Docker Alpine DNS Issue goes away; gliderlabs/docker-alpine#255 * [Docker] Ignore more files from Docker Image
- Loading branch information
1 parent
c695666
commit 203d8c1
Showing
2 changed files
with
18 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,14 @@ | ||
.git | ||
.gitattributes | ||
.github/* | ||
.travis.yml | ||
cache/* | ||
CONTRIBUTING.md | ||
DEBUG | ||
Dockerfile | ||
whitelist.txt | ||
phpcompatibility.xml | ||
phpcs.xml | ||
CONTRIBUTING.md | ||
phpcs.xml | ||
scalingo.json | ||
tests/* | ||
whitelist.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,11 @@ | ||
FROM ulsmith/alpine-apache-php7 | ||
FROM php:7-apache | ||
|
||
COPY ./ /app/public/ | ||
ENV APACHE_DOCUMENT_ROOT=/app | ||
|
||
RUN chown -R apache:root /app/public | ||
RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ | ||
&& apt-get --yes update && apt-get --yes install libxml2-dev \ | ||
&& docker-php-ext-install -j$(nproc) simplexml \ | ||
&& sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \ | ||
&& sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf | ||
|
||
COPY --chown=www-data:www-data ./ /app/ |