Compare commits

...
5 Commits
Author SHA1 Message Date
Michal Čihař 7d6f729bc6 Fix PHP configuration name
Fixes #32

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-10 12:34:58 +02:00
Michal Čihař 593d7f5f96 Include PHP modules for bz2 and zip
Fixes #33

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-10 12:34:01 +02:00
Michal Čihař ae243b8077 Add test for sessions after shutdown (issue #32)
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 10:16:08 +02:00
Michal Čihař 96e3c94c6b Try testing docker compose as well
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 10:10:28 +02:00
Michal Čihař 23cb076766 Use persistent volume for sessions
Issue #32

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 10:03:35 +02:00
4 changed files with 12 additions and 2 deletions
+5
View File
@@ -33,4 +33,9 @@ script:
- docker-compose up -d
- docker ps -a
- curl http://127.0.0.1:8080/ | grep -q input_password
- curl --cookie-jar /tmp/cj --location -d pma_servername=db -d pma_username=root -d pma_password=my-secret-pw -d server=1 http://127.0.0.1:8080/ | grep -r 'db via TCP'
- docker-compose stop
# Test session survives shutdown
- docker-compose up -d
- curl --cookie-jar /tmp/cj --location http://127.0.0.1:8080/ | grep -r 'db via TCP'
- docker-compose stop
+3 -1
View File
@@ -1,7 +1,7 @@
# Switch back to stable once 3.4 is out
FROM alpine:edge
RUN apk add --no-cache php5-cli php5-mysqli php5-ctype php5-xml php5-gd php5-zlib php5-openssl php5-curl php5-opcache php5-json php5-mcrypt curl
RUN apk add --no-cache php5-cli php5-mysqli php5-ctype php5-xml php5-gd php5-zlib php5-bz2 php5-zip php5-openssl php5-curl php5-opcache php5-json php5-mcrypt curl
RUN curl --location https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-languages.tar.gz | tar xzf - \
&& mv phpMyAdmin* /www \
@@ -11,6 +11,8 @@ COPY config.inc.php /www/
COPY run.sh /run.sh
RUN chmod u+rwx /run.sh
VOLUME /sessions
EXPOSE 80
ENV PHP_UPLOAD_MAX_FILESIZE=64M \
+2
View File
@@ -6,3 +6,5 @@ phpmyadmin:
restart: always
ports:
- 8080:80
volumes:
- /sessions
Regular → Executable
+2 -1
View File
@@ -11,4 +11,5 @@ fi
exec php -S 0.0.0.0:80 -t /www/ \
-d upload_max_filesize=$PHP_UPLOAD_MAX_FILESIZE \
-d post_max_size=$PHP_UPLOAD_MAX_FILESIZE \
-d max_input_vars=$PHP_MAX_INPUT_VARS
-d max_input_vars=$PHP_MAX_INPUT_VARS \
-d session.save_path=/sessions