Skip to content

Commit

Permalink
add fig and disable ssl
Browse files Browse the repository at this point in the history
  • Loading branch information
johna1203 committed Jul 28, 2015
1 parent 10d3fba commit 97d9225
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -2,7 +2,7 @@ FROM johna1203/docker-nginx-php:latest
MAINTAINER Johnathan Froeming <johnathan@kodokux.com>
ENV VERSION 1.9.0.1

RUN apt-get install -y mysql-client
RUN apt-get update && apt-get install -y mysql-client

ADD config /config
ADD etc /etc
17 changes: 7 additions & 10 deletions etc/nginx/addon.d/default-php.conf
@@ -1,20 +1,17 @@
client_max_body_size 256m;
index index.html index.php;

listen 443 ssl;
#listen 443 ssl;

ssl_certificate /etc/nginx/certs/startssl.crt;
ssl_certificate_key /etc/nginx/certs/startssl.nop.key;
ssl_session_timeout 5m;
#ssl_certificate /etc/nginx/certs/startssl.crt;
#ssl_certificate_key /etc/nginx/certs/startssl.nop.key;
#ssl_session_timeout 5m;
# SSLv2以下は利用しない
ssl_protocols SSLv3 TLSv1;
#ssl_protocols SSLv3 TLSv1;
# 暗号スイートの指定
ssl_ciphers RC4-SHA:HIGH:!ADH;
#ssl_ciphers RC4-SHA:HIGH:!ADH;
# 暗号の選択をサーバ側で決定
ssl_prefer_server_ciphers on;



#ssl_prefer_server_ciphers on;

location / {
index index.html index.php; ## Allow a static html file to be shown first
Expand Down
20 changes: 20 additions & 0 deletions fig.yml
@@ -0,0 +1,20 @@
mariadbdata:
image: johna1203/docker-data
mariadb:
image: johna1203/docker-mariadb
volumes_from:
- magentodata
ports:
- "3306:3306"
magentodata:
image: johna1203/docker-data
volumes:
- ./magento:/data
web:
build: .
ports:
- "80:80"
volumes_from:
- magentodata
links:
- mariadb:mariadb

0 comments on commit 97d9225

Please sign in to comment.