diff --git a/Dockerfile b/Dockerfile index 8dd286a0..157bb87c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,6 @@ COPY mockintosh/ ./mockintosh/ RUN pip3 install . +WORKDIR /tmp + ENTRYPOINT ["mockintosh"] diff --git a/docs/Changelog.md b/docs/Changelog.md index 39d2919a..9a92014d 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -173,8 +173,6 @@ ## Other -- Better way to support GraphQL - - Nicer logging of requests, with special option to enable it. - Nicer formatted error pages for known errors, explaining the problem diff --git a/mockintosh/__init__.py b/mockintosh/__init__.py index fcd56080..4773cae6 100644 --- a/mockintosh/__init__.py +++ b/mockintosh/__init__.py @@ -247,7 +247,7 @@ def initiate(): try: load_override = _handle_oas_input(source, ['config.yaml', 'yaml'], True) logging.info("Automatically transpiled the config YAML from OpenAPI Specification.") - except ValidationError: + except (ValidationError, AttributeError): logging.debug("The input is not a valid OpenAPI Specification, defaulting to Mockintosh config.") except ResolutionError: # pragma: no cover pass diff --git a/mockintosh/res/management.html b/mockintosh/res/management.html index b14b2675..749d3a31 100644 --- a/mockintosh/res/management.html +++ b/mockintosh/res/management.html @@ -711,7 +711,6 @@

Consumers

$("#reqlog input").prop('checked', result['log']['_enabled']); for (; traffic_offset < result.log.entries.length; traffic_offset++) { const entry = result.log.entries[traffic_offset]; - const url = new URL(entry.request.url); const li = $("
  • ").addClass('list-group-item').data('obj', entry); const dateBlock = $('' + new Date(entry.startedDateTime).toLocaleString(language) + ''); @@ -1030,7 +1029,7 @@

    Consumers

    'accept', 'accept-charset', 'accept-datetime', 'accept-encoding', 'accept-language', 'access-control-allow-credentials', 'access-control-allow-origin', 'access-control-request-headers', 'access-control-request-method', 'access-control-allow-methods', - 'authorization', 'cache-control', 'connection', 'content-encoding', 'content-length', 'content-type', 'cookie', + 'authorization', 'cache-control', 'connection', 'content-encoding', 'content-length', 'cookie', 'date', 'dnt', 'expect', 'forwarded', 'from', 'front-end-https', 'host', 'http2-settings', 'if-match', 'if-modified-since', 'if-none-match', 'if-range', 'if-unmodified-since', 'max-forwards', 'origin', 'pragma', 'proxy-authorization', 'proxy-connection', 'range', 'referer',