FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge branch 'master' into edge-4.7 · phpmyadmin/docker@797b16c · GitHub

Repository navigation

Commit 797b16c

Browse files
committed
Merge branch 'master' into edge-4.7
2 parents a924c9d + 15e82b2 commit 797b16c

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM alpine:3.5
22

33
# Install dependencies
4-
RUN apk add --no-cache php7-session php7-mysqli php7-mbstring php7-xml php7-gd php7-zlib php7-bz2 php7-zip php7-openssl php7-curl php7-opcache php7-json php7-ctype nginx php7-fpm supervisor
4+
RUN apk add --no-cache php7-session php7-mysqli php7-mbstring php7-xml php7-gd php7-zlib php7-bz2 php7-zip php7-openssl php7-curl php7-opcache php7-json nginx php7-fpm supervisor
55

66
# Include keyring to verify download
77
COPY phpmyadmin.keyring /

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin/phpmyadmin
5656
You can use arbitrary servers by adding ENV variable `PMA_ARBITRARY=1` to the startup command:
5757

5858
```
59-
docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -e PMA_ARBITRARY=1 phpmyadmin/phpmyadmin
59+
docker run --name myadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin/phpmyadmin
6060
```
6161

6262
## Usage with docker-compose and arbitrary server

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL