Page MenuHomeDevCentral
Files F3744468

D343.id812.diff
No OneTemporary
Actions

D343.id812.diff
View Options

diff --git a/Dockerfile b/Dockerfile
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,8 @@
# Nasqueron - Base nginx / php-fpm image
#
-FROM armv7/armhf-debian
-MAINTAINER Kaliiixx <modepadu95@riseup.net>
+FROM debian:jessie
+MAINTAINER Sébastien Santoro aka Dereckson <dereckson+nasqueron-docker@espace-win.org>
#
# Prepare the container
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -47,9 +47,6 @@
# If you need other processes, adds a /etc/service/<service name>/run file
That's it.
-<<<<<<< HEAD
-# docker-arm-nginx-php-fpm
-=======
## How to upgrade this image?
@@ -60,4 +57,3 @@
cd novolume
make update
```
->>>>>>> 4e6ef53562dafae51fbd8da1dbaf50148bbda6aa

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 05:52 (6 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2246489
Default Alt Text
D343.id812.diff (710 B)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator