From 5e9eeecdcd40d94b498ece04e2d71a33e3d8d948 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 10:01:38 -0400 Subject: [PATCH 1/7] vscode --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ec156a9..ea1169a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ dist/ .tox *.egg-info *.swp +.vscode/ From 665ec9710c060048dbdc15693ea955a9ace53e36 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 10:01:51 -0400 Subject: [PATCH 2/7] labels for dockerfile --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 681bcd7..541f4cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,10 @@ FROM ubuntu:18.04 +LABEL name="httpbin" +LABEL version="0.9.0" +LABEL description="A simple HTTP service." +LABEL org.kennethreitz.vendor="Kenneth Reitz" + RUN apt update -y && apt install python3-pip -y EXPOSE 80 From fdad46da302eb1fd0023283e3c79a878c8b0a046 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 10:48:14 -0400 Subject: [PATCH 3/7] only https --- httpbin/core.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/httpbin/core.py b/httpbin/core.py index 0a00a82..fe100f0 100644 --- a/httpbin/core.py +++ b/httpbin/core.py @@ -83,8 +83,7 @@ template = { "host": "httpbin.org", # overrides localhost:5000 "basePath": "/", # base bash for blueprint registration "schemes": [ - "https", - "http" + "https" ], 'protocol': 'https', 'tags': [ From 4c3c25684157a773881fd98344c525a3793c3033 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 10:49:39 -0400 Subject: [PATCH 4/7] now.json --- now.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/now.json b/now.json index 0967ef4..b384fe9 100644 --- a/now.json +++ b/now.json @@ -1 +1,6 @@ -{} +{ + "regions": [ + "all" + ], + "alias": "httpbin.org" +} From 8f5464f5a3b8dbc3c00cd2245fb0cc09a4161929 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 10:57:10 -0400 Subject: [PATCH 5/7] updates --- httpbin/templates/index.html | 283 ++++++++++++++++++++++++++++------- now.json | 8 +- 2 files changed, 239 insertions(+), 52 deletions(-) diff --git a/httpbin/templates/index.html b/httpbin/templates/index.html index 7fbae03..5fed70c 100644 --- a/httpbin/templates/index.html +++ b/httpbin/templates/index.html @@ -1,70 +1,251 @@ + httpbin(1): HTTP Client Testing Service - - - + + + -{% include 'httpbin.1.html' %} - -{% if tracking_enabled %} - {% include 'trackingscripts.html' %} -{% endif %} + {% include 'httpbin.1.html' %} {% if tracking_enabled %} {% include 'trackingscripts.html' %} {% endif %} + diff --git a/now.json b/now.json index b384fe9..5d309f6 100644 --- a/now.json +++ b/now.json @@ -1,6 +1,12 @@ { + "name": "httpbin", "regions": [ "all" ], - "alias": "httpbin.org" + "alias": [ + "httpbin.org" + ], + "type": [ + "docker" + ] } From 6693e0d971a3ed8a50410431b9ea906091142c87 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 10:57:40 -0400 Subject: [PATCH 6/7] fix --- now.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/now.json b/now.json index 5d309f6..26fd17f 100644 --- a/now.json +++ b/now.json @@ -6,7 +6,5 @@ "alias": [ "httpbin.org" ], - "type": [ - "docker" - ] + "type": "docker" } From 390595e029e43a921a6a72c7c592a8da4f13114d Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Wed, 4 Jul 2018 11:00:38 -0400 Subject: [PATCH 7/7] template --- httpbin/templates/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/httpbin/templates/index.html b/httpbin/templates/index.html index 5fed70c..0348536 100644 --- a/httpbin/templates/index.html +++ b/httpbin/templates/index.html @@ -207,10 +207,6 @@ text-align: right; float: right; } - - .scheme-container { - display: none !important; - }