Skip to content

Commit 6b5c934

Browse files
BaDosBaDos
authored
Merge pull request #102 from magento-commerce/develop
MCLOUD-9560: October cloud tools release
2 parents 9d84dcf + 05732b0 commit 6b5c934

File tree

15 files changed

+548
-179
lines changed

15 files changed

+548
-179
lines changed

‎.travis.yml

-99
This file was deleted.

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento-cloud-docker",
33
"description": "Magento Cloud Docker",
44
"type": "magento2-component",
5-
"version": "1.3.3",
5+
"version": "1.3.4",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"

‎images/php/7.2-cli/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ RUN pecl install -o -f \
136136
gnupg \
137137
igbinary \
138138
imagick \
139-
mailparse \
139+
mailparse-3.1.3 \
140140
msgpack \
141141
oauth \
142142
pcov \

‎images/php/7.2-fpm/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ RUN pecl install -o -f \
111111
gnupg \
112112
igbinary \
113113
imagick \
114-
mailparse \
114+
mailparse-3.1.3 \
115115
msgpack \
116116
oauth \
117117
pcov \

‎images/varnish/6.5/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM varnish:6.5
2+
3+
COPY etc/default.vcl /etc/varnish/

‎images/varnish/6.5/etc/default.vcl

+177
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
vcl 4.0;
2+
3+
import std;
4+
5+
# The minimal Varnish version is 4.0
6+
# For SSL offloading, pass the following header in your proxy server or load balancer: 'SSL-OFFLOADED: https'
7+
8+
backend default {
9+
.host = "web";
10+
.port = "8080";
11+
.first_byte_timeout = 300s;
12+
.between_bytes_timeout = 300s;
13+
}
14+
15+
sub vcl_recv {
16+
# Ensure the true IP is sent onwards.
17+
# This was an issue getting xdebug working through varnish
18+
# whilst having a proxy infront of varnish (for local docker dev)
19+
if (req.http.X-Real-Ip) {
20+
set req.http.X-Forwarded-For = req.http.X-Real-Ip;
21+
}
22+
23+
if (req.method == "PURGE") {
24+
if (!req.http.X-Magento-Tags-Pattern) {
25+
return (synth(400, "X-Magento-Tags-Pattern header required"));
26+
}
27+
ban("obj.http.X-Magento-Tags ~ " + req.http.X-Magento-Tags-Pattern);
28+
return (synth(200, "Purged"));
29+
}
30+
31+
# Bypass debug session
32+
if (req.http.Cookie ~ "(^|;\s*)(XDEBUG_SESSION=.*)(;|$)") {
33+
return (pass);
34+
}
35+
36+
if (req.method != "GET" &&
37+
req.method != "HEAD" &&
38+
req.method != "PUT" &&
39+
req.method != "POST" &&
40+
req.method != "TRACE" &&
41+
req.method != "OPTIONS" &&
42+
req.method != "DELETE") {
43+
/* Non-RFC2616 or CONNECT which is weird. */
44+
return (pipe);
45+
}
46+
47+
# We only deal with GET and HEAD by default
48+
if (req.method != "GET" && req.method != "HEAD") {
49+
return (pass);
50+
}
51+
52+
# Bypass shopping cart, checkout and search requests
53+
if (req.url ~ "/checkout" || req.url ~ "/catalogsearch") {
54+
return (pass);
55+
}
56+
57+
# normalize url in case of leading HTTP scheme and domain
58+
set req.url = regsub(req.url, "^http[s]?://", "");
59+
60+
# collect all cookies
61+
std.collect(req.http.Cookie);
62+
63+
# Compression filter. See https://www.varnish-cache.org/trac/wiki/FAQ/Compression
64+
if (req.http.Accept-Encoding) {
65+
if (req.url ~ "\.(jpg|jpeg|png|gif|gz|tgz|bz2|tbz|mp3|ogg|swf|flv)$") {
66+
# No point in compressing these
67+
unset req.http.Accept-Encoding;
68+
} elsif (req.http.Accept-Encoding ~ "gzip") {
69+
set req.http.Accept-Encoding = "gzip";
70+
} elsif (req.http.Accept-Encoding ~ "deflate" && req.http.user-agent !~ "MSIE") {
71+
set req.http.Accept-Encoding = "deflate";
72+
} else {
73+
# unkown algorithm
74+
unset req.http.Accept-Encoding;
75+
}
76+
}
77+
78+
# Remove Google gclid parameters to minimize the cache objects
79+
set req.url = regsuball(req.url,"\?gclid=[^&]+$",""); # strips when QS = "?gclid=AAA"
80+
set req.url = regsuball(req.url,"\?gclid=[^&]+&","?"); # strips when QS = "?gclid=AAA&foo=bar"
81+
set req.url = regsuball(req.url,"&gclid=[^&]+",""); # strips when QS = "?foo=bar&gclid=AAA" or QS = "?foo=bar&gclid=AAA&bar=baz"
82+
83+
# static files are always cacheable. remove SSL flag and cookie
84+
if (req.url ~ "^/(pub/)?(media|static)/.*\.(ico|css|js|jpg|jpeg|png|gif|tiff|bmp|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)$") {
85+
unset req.http.Https;
86+
unset req.http.SSL-OFFLOADED;
87+
unset req.http.Cookie;
88+
}
89+
90+
return (hash);
91+
}
92+
93+
sub vcl_hash {
94+
if (req.http.cookie ~ "X-Magento-Vary=") {
95+
hash_data(regsub(req.http.cookie, "^.*?X-Magento-Vary=([^;]+);*.*$", "\1"));
96+
}
97+
98+
# For multi site configurations to not cache each other's content
99+
if (req.http.host) {
100+
hash_data(req.http.host);
101+
} else {
102+
hash_data(server.ip);
103+
}
104+
105+
# To make sure http users don't see ssl warning
106+
if (req.http.SSL-OFFLOADED) {
107+
hash_data(req.http.SSL-OFFLOADED);
108+
}
109+
110+
# Cache https seperately
111+
if (req.http.X-Forwarded-Proto) {
112+
hash_data(req.http.X-Forwarded-Proto);
113+
}
114+
}
115+
116+
sub vcl_backend_response {
117+
if (beresp.http.content-type ~ "text") {
118+
set beresp.do_esi = true;
119+
}
120+
121+
if (bereq.url ~ "\.js$" || beresp.http.content-type ~ "text") {
122+
set beresp.do_gzip = true;
123+
}
124+
125+
# cache only successfully responses and 404s
126+
if (beresp.status != 200 && beresp.status != 404) {
127+
set beresp.ttl = 0s;
128+
set beresp.uncacheable = true;
129+
return (deliver);
130+
} elsif (beresp.http.Cache-Control ~ "private") {
131+
set beresp.uncacheable = true;
132+
set beresp.ttl = 86400s;
133+
return (deliver);
134+
}
135+
136+
if (beresp.http.X-Magento-Debug) {
137+
set beresp.http.X-Magento-Cache-Control = beresp.http.Cache-Control;
138+
}
139+
140+
# validate if we need to cache it and prevent from setting cookie
141+
# images, css and js are cacheable by default so we have to remove cookie also
142+
if (beresp.ttl > 0s && (bereq.method == "GET" || bereq.method == "HEAD")) {
143+
unset beresp.http.set-cookie;
144+
if (bereq.url !~ "\.(ico|css|js|jpg|jpeg|png|gif|tiff|bmp|gz|tgz|bz2|tbz|mp3|ogg|svg|swf|woff|woff2|eot|ttf|otf)(\?|$)") {
145+
set beresp.http.Pragma = "no-cache";
146+
set beresp.http.Expires = "-1";
147+
set beresp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
148+
set beresp.grace = 1m;
149+
}
150+
}
151+
152+
# If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass
153+
if (beresp.ttl <= 0s ||
154+
beresp.http.Surrogate-control ~ "no-store" ||
155+
(!beresp.http.Surrogate-Control && beresp.http.Vary == "*")) {
156+
# Mark as Hit-For-Pass for the next 2 minutes
157+
set beresp.ttl = 120s;
158+
set beresp.uncacheable = true;
159+
}
160+
return (deliver);
161+
}
162+
163+
sub vcl_deliver {
164+
if (resp.http.x-varnish ~ " ") {
165+
set resp.http.X-Magento-Cache-Debug = "HIT";
166+
} else {
167+
set resp.http.X-Magento-Cache-Debug = "MISS";
168+
}
169+
170+
unset resp.http.X-Magento-Debug;
171+
unset resp.http.X-Magento-Tags;
172+
unset resp.http.X-Powered-By;
173+
unset resp.http.Server;
174+
unset resp.http.X-Varnish;
175+
unset resp.http.Via;
176+
unset resp.http.Link;
177+
}

‎images/varnish/7.0/Dockerfile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM varnish:7.0
2+
3+
COPY etc/default.vcl /etc/varnish/

0 commit comments

Comments
 (0)