mirror of
https://github.com/luzifer-docker/alpine-nginx-php.git
synced 2024-11-09 09:50:01 +00:00
remove redis dep., amend makefile commands
This commit is contained in:
parent
024afa246e
commit
5032f79da2
3 changed files with 11 additions and 11 deletions
|
@ -3,8 +3,7 @@ FROM sillelien/base-alpine:0.10
|
||||||
MAINTAINER Michael Dimmock <https://github.com/michaeldim>
|
MAINTAINER Michael Dimmock <https://github.com/michaeldim>
|
||||||
|
|
||||||
# Install packages
|
# Install packages
|
||||||
RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
|
RUN apk-install nginx \
|
||||||
apk-install nginx \
|
|
||||||
bash \
|
bash \
|
||||||
curl \
|
curl \
|
||||||
git \
|
git \
|
||||||
|
@ -18,14 +17,13 @@ RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/re
|
||||||
php-mysql \
|
php-mysql \
|
||||||
php-pdo_mysql \
|
php-pdo_mysql \
|
||||||
php-phar \
|
php-phar \
|
||||||
phpredis@testing \
|
|
||||||
php-openssl && \
|
php-openssl && \
|
||||||
curl -sS https://getcomposer.org/installer | php && \
|
curl -sS https://getcomposer.org/installer | php && \
|
||||||
mv composer.phar /usr/local/bin/ && \
|
mv composer.phar /usr/local/bin/ && \
|
||||||
rm -Rf /var/www/*
|
rm -Rf /var/www/*
|
||||||
|
|
||||||
# Add configuration files
|
# Copy configuration files to root
|
||||||
ADD rootfs /
|
COPY rootfs /
|
||||||
|
|
||||||
# Fix permissions
|
# Fix permissions
|
||||||
RUN chown -Rf nginx:www-data /var/www/
|
RUN chown -Rf nginx:www-data /var/www/
|
||||||
|
|
12
Makefile
12
Makefile
|
@ -1,10 +1,12 @@
|
||||||
|
CURRENT_DIRECTORY := $(shell pwd)
|
||||||
NAME = alpine-nginx-php
|
NAME = alpine-nginx-php
|
||||||
TAG = latest
|
TAG = latest
|
||||||
IMAGE = michaeldim/$(NAME)
|
IMAGE = michaeldim/$(NAME)
|
||||||
|
|
||||||
.PHONY: all build
|
|
||||||
|
|
||||||
all: build
|
|
||||||
|
|
||||||
build:
|
build:
|
||||||
@docker build -t $(IMAGE):$(TAG) --rm .
|
@docker build -t $(IMAGE):$(TAG) $(CURRENT_DIRECTORY)
|
||||||
|
|
||||||
|
build-no-cache:
|
||||||
|
@docker build -t $(IMAGE):$(TAG) --no-cache $(CURRENT_DIRECTORY)
|
||||||
|
|
||||||
|
.PHONY: build build-no-cache
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# alpine-nginx-php
|
# alpine-nginx-php
|
||||||
Alpine Linux Docker image (~52.46 MB) running Nginx and PHP 5.6.14 Image suitable for running Alpine Linux in Tutum/Kubernetes style hosted distributed environments.
|
Alpine Linux Docker image (~54.3 MB) running Nginx and PHP 5.6.14 Image suitable for running Alpine Linux in Tutum/Kubernetes style hosted distributed environments.
|
||||||
|
|
||||||
Image is based on [sillelien/base-alpine](https://hub.docker.com/r/sillelien/base-alpine/) base image which incorporates S6 for process management.
|
Image is based on [sillelien/base-alpine](https://hub.docker.com/r/sillelien/base-alpine/) base image which incorporates S6 for process management.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue