Skip to content

Commit 901a975

Browse files
[FIX] Build was missing libzip and image information was not about Tiki
1 parent 8116309 commit 901a975

File tree

2 files changed

+46
-19
lines changed

2 files changed

+46
-19
lines changed

Diff for: Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM php:7
2-
MAINTAINER Fabio Montefuscolo <[email protected]>
2+
LABEL mantainer "TikiWiki <[email protected]>"
33

44
RUN apt-get update \
5-
&& apt-get install -y libldb-dev libldap2-dev libmemcached-dev libpng-dev libjpeg-dev unzip \
5+
&& apt-get install -y libldb-dev libldap2-dev libmemcached-dev libpng-dev libjpeg-dev libzip-dev unzip \
66
&& ln -s /usr/lib/x86_64-linux-gnu/libldap.so /usr/lib/libldap.so \
77
&& ln -s /usr/lib/x86_64-linux-gnu/liblber.so /usr/lib/liblber.so \
88
&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
@@ -22,7 +22,7 @@ RUN apt-get update \
2222
composer global require psy/psysh --prefer-stable; \
2323
} \
2424
&& rm installer.php \
25-
&& apt-get purge -y libldb-dev libldap2-dev libmemcached-dev libpng-dev libjpeg-dev \
25+
&& apt-get purge -y libldb-dev libldap2-dev libmemcached-dev libpng-dev libjpeg-dev libzip-dev \
2626
&& rm -rf /var/lib/apt/lists/* \
2727
&& rm -rf /tmp/* \
2828
&& { \

Diff for: README.md

+43-16
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,55 @@
33
A PHP image extended to bundle libraries commonly used in PHP projects. The following
44
libraires are included:
55

6-
* libpng12
7-
* libjpeg
8-
* libmemcached
9-
* libmcrypt
6+
* apcu
7+
* calendar
8+
* Core
9+
* ctype
10+
* curl
11+
* date
12+
* dom
13+
* fileinfo
14+
* filter
15+
* ftp
1016
* gd
11-
* mysqli
12-
* opcache
13-
* zip
17+
* hash
18+
* iconv
19+
* json
20+
* ldap
21+
* libxml
1422
* mbstring
15-
* mcrypt
16-
* memcache
1723
* memcached
24+
* mysqli
25+
* mysqlnd
26+
* openssl
27+
* pcre
28+
* PDO
29+
* pdo_mysql
30+
* pdo_sqlite
31+
* Phar
32+
* posix
33+
* readline
34+
* Reflection
35+
* session
36+
* SimpleXML
37+
* sodium
38+
* SPL
39+
* sqlite3
40+
* standard
41+
* tokenizer
1842
* xdebug
19-
43+
* xml
44+
* xmlreader
45+
* xmlwriter
46+
* zip
47+
* zlib
2048

2149
## Usage
2250

2351
### Simple server
2452

2553
```
26-
docker run --name elephant -v /path/to/project:/var/www/html -d hacklabr/php
54+
docker run --name tikiwiki -v /path/tiki-source:/var/www/html -d tikiwiki/php
2755
```
2856

2957

@@ -32,7 +60,7 @@ docker run --name elephant -v /path/to/project:/var/www/html -d hacklabr/php
3260
When creating your container, enable XDebug by setting env variable `XDEBUG`
3361

3462
```
35-
docker run --name elephant -e XDEBUG=1 -v /path/to/project:/var/www/html -d hacklab/php
63+
docker run --name tikiwiki -e XDEBUG=1 -v /path/tiki-source:/var/www/html -d tikiwiki/php
3664
```
3765

3866
Tell your Atom about folder mapping by editin `config.cson`. You have to configure the
@@ -42,7 +70,7 @@ section called "php-debug". It should look like this:
4270
"php-debug":
4371
PathMaps: [
4472
"remotepath;localpath"
45-
"/var/www/html/;/home/fabio/devel/catraca/src/"
73+
"/var/www/html/;/path/tiki-source"
4674
]
4775
PhpException:
4876
CatchableFatalError: false
@@ -65,8 +93,8 @@ upload 2GB files.
6593

6694

6795
```
68-
FROM hacklab/php
69-
LABEL mantainer "Hacklab <contato@hacklab.com.br>"
96+
FROM tikiwiki/php
97+
LABEL mantainer "Some Developer <developer@example.com>"
7098
7199
RUN { \
72100
echo "file_uploads = On"; \
@@ -77,4 +105,3 @@ RUN { \
77105
78106
USER root
79107
```
80-

0 commit comments

Comments
 (0)