You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2018/08/26 15:34:14 UTC
[6/6] httpcomponents-core git commit: Upgraded nginx image to version
1.15; fixed push configuration
Upgraded nginx image to version 1.15; fixed push configuration
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/38b7d8b2
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/38b7d8b2
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/38b7d8b2
Branch: refs/heads/master
Commit: 38b7d8b28edd7de056970a0d22706ed79c6b3e21
Parents: 4320a21
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sun Aug 26 17:33:35 2018 +0200
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Aug 26 17:33:35 2018 +0200
----------------------------------------------------------------------
httpcore5-testing/docker/nginx/Dockerfile | 2 +-
httpcore5-testing/docker/nginx/default.conf | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/38b7d8b2/httpcore5-testing/docker/nginx/Dockerfile
----------------------------------------------------------------------
diff --git a/httpcore5-testing/docker/nginx/Dockerfile b/httpcore5-testing/docker/nginx/Dockerfile
index 427468e..25645b4 100644
--- a/httpcore5-testing/docker/nginx/Dockerfile
+++ b/httpcore5-testing/docker/nginx/Dockerfile
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM nginx:1.11
+FROM nginx:1.15
MAINTAINER dev@hc.apache.org
ENV var_dir /var/nginx
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/38b7d8b2/httpcore5-testing/docker/nginx/default.conf
----------------------------------------------------------------------
diff --git a/httpcore5-testing/docker/nginx/default.conf b/httpcore5-testing/docker/nginx/default.conf
index dbaaa6b..5bcb541 100644
--- a/httpcore5-testing/docker/nginx/default.conf
+++ b/httpcore5-testing/docker/nginx/default.conf
@@ -22,11 +22,10 @@ server {
index index.html;
location = /index.html {
- add_header Link "</css/site.css>;rel=preload";
- add_header Link "</css/maven-theme.css>;rel=preload";
- add_header Link "</css/maven-base.css>;rel=preload";
- add_header Link "</css/hc-maven.css>;rel=preload";
- add_header Link "</images/logos/httpcomponents.png>;rel=preload";
+ http2_push "/css/site.css";
+ http2_push "/css/maven-theme.css";
+ http2_push "/css/hc-maven.css";
+ http2_push "/images/logos/httpcomponents.png";
}
}