Commit Graph

54978 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 2fe7e6106a
Optimize configuration to reduce build-times
- remove wildcard match for defaults (this caused a ripple effect
  and slowed down total build time with 60 seconds?)
- skip generating metadata.json (which took 25+ seconds)
- skip generating sitemap.xml (10+ seconds)

Build-times before/after:

Production before:  132 seconds
Production after:    62 seconds
Development before: 121 seconds
Development after:   35 seconds

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-23 13:35:14 +02:00
Sebastiaan van Stijn 9b79a27ab4
Dockerfile: output Jekyll profile information
Also skip updating sitemap.xml for the development environment.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-23 13:35:12 +02:00
Sebastiaan van Stijn ea7b89ea2b
inline side-menu include
It was fully static, only used in a single place, but would be processed
for each page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-23 13:35:10 +02:00
Usha Mandya d63d70ca63
Merge pull request #11604 from thaJeztah/less_overrides
Less overrides
2020-10-23 11:02:36 +01:00
Sebastiaan van Stijn 9c5976456c
Remove img.with-border style
The border was barely visible, was only used in a single place,
and didn't add much.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-22 17:08:04 +02:00
Sebastiaan van Stijn b9395f0d68
_scss: reduce overrides to make styling easier and more consistent
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-22 17:08:02 +02:00
Sebastiaan van Stijn 2091f8ec57
engine/reference/commandline: disable read-time through config
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-22 17:08:00 +02:00
Sebastiaan van Stijn 34a8929065
Skip read-time if it's a minute or less
I don't think the read-time is adding much value on short pages. The
reader is likely able to make a better estimation how long it would
take to read.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-22 17:07:58 +02:00
Sebastiaan van Stijn 91425c3708
Small changes to reading time to prevent redraws
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-22 17:07:56 +02:00
Sebastiaan van Stijn 72baee9555
_includes/head.html: preload OpenSans font to prevent redraws
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-22 17:07:54 +02:00
Sebastiaan van Stijn 0790040ded
Remove unused "tree" metadata variable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-22 17:07:51 +02:00
Usha Mandya cec5201515
Merge pull request #11600 from thaJeztah/prod_develop
Separate "development" and "production" configurations
2020-10-22 15:04:02 +01:00
Sebastiaan van Stijn 5a1ae8310f
Separate "development" and "production" configurations
This patch updates the default configuration to match a "development"
situation, and introduces build-options to produce a "production"
build.

By default (dev environment):

- Google Analytics / GTM and PollDaddy are disabled
- SASS builds non-minified stylesheets (for easier readabililty)
- Excludes "enterprise" stubs

Building a "production" build locally is still possible by overriding
the `JEKYLL_ENV` build-arg;

    JEKYLL_ENV=production docker-compose  up --build

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-22 15:41:15 +02:00
Stephen Turner 296ee4f168
Add link to relevant Microsoft documentation (#11596)
* Add link to relevant Microsoft documentation

* Minor update

Co-authored-by: Usha Mandya <47779042+usha-mandya@users.noreply.github.com>
2020-10-21 18:05:49 +01:00
Usha Mandya 3ac3540f93
Merge pull request #11594 from thaJeztah/indexing_tweaks
Updates to handling of non-indexable pages
2020-10-21 15:27:44 +01:00
Sebastiaan van Stijn b4f5167074
DDE: disable indexing
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:46:56 +02:00
Sebastiaan van Stijn e3ef5c5085
machine: move overview page to /machine/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:44:05 +02:00
Sebastiaan van Stijn ce451cba54
remove machine/index.md (to be replaced)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:35:46 +02:00
Sebastiaan van Stijn 26926972ea
machine: handle indexing through config
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:32:17 +02:00
Sebastiaan van Stijn 126c4cf202
_samples: remove titles, keywords and description
These were not used in the generated redirect pages,
so we can remove them.

Also setting the "sitemap" metadata through the _config.yml
so that we don't have to set it in each of the stubs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:09:33 +02:00
Sebastiaan van Stijn 735bbc54ab
_samples: redirect Docker Hub sample pages to Docker Hub
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:09:21 +02:00
Sebastiaan van Stijn 3c869fb0e3
_layouts: fix redirect layout for external URLs
This allows `redirect_to` redirects to external websites;

    curl localhost:4000/samples/library/adminer/
    <!DOCTYPE html>
    <html lang="en-US">
      <meta charset="utf-8">
      <title>Redirecting&hellip;</title>
      <link rel="canonical" href="https://hub.docker.com/_/adminer/"><meta http-equiv="refresh" content="0; url=https://hub.docker.com/_/adminer/">
      <meta name="robots" content="noindex">
      <h1>Redirecting&hellip;</h1>
      <a href="https://hub.docker.com/_/adminer/">Click here if you are not redirected.</a>
      <script>location="https://hub.docker.com/_/adminer/"</script>
    </html>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:09:14 +02:00
Sebastiaan van Stijn 03d60f916a
Replace "hide_from_sitemap" with "sitemap: false"
The `hide_from_sitemap` metadata variable was a custom thing we implemented
to add a "noindex" meta-header to pages and to exclude a page from the
search auto-complete.

However, pages with that option set would still be included in sitemap.xml,
resulting in search engines to visit those pages (only to discover they
should not index them).

This patch replaces the custom `hide_from_sitemap` value for `sitemap: false`,
which is a metadata variable that's defined by the "jekyll-sitemap" plugin
we use to generate the sitemap.xml;

https://github.com/jekyll/jekyll-sitemap/blob/v1.4.0/README.md#exclusions

Setting this variable will now:

- add a "noindex" metadata header to the page
- exclude the page from the sitemap.xml.
- exclude the page from /js/metadata.json (used for search autocomplete)

Also fixed an issue in the metadata.json where the `notoc` metadata was
used to exclude pages, however that variable is meant to disable the
in-page TOC (right-hand side navigation with anchor links).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-21 15:09:11 +02:00
Usha Mandya 1c9b279e09
Merge pull request #11519 from andylibrian/fix-cpu-period-default-value
Update config/containers/resource_constraints.md
2020-10-21 13:53:39 +01:00
Sebastiaan van Stijn 088c702b21
Merge pull request #11587 from usha-mandya/engdocs-354
Remove Docker Toolbox docs
2020-10-20 23:33:50 +02:00
Usha Mandya 7ce11ce954
Merge pull request #11589 from thaJeztah/dde_images
DDE: fix various broken links and links to images
2020-10-20 22:15:27 +01:00
Usha Mandya 3e97e66108
Update _data/advisories.yaml
Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
2020-10-20 21:38:40 +01:00
Sebastiaan van Stijn e238ba1815
DDE: fix various broken links and links to images
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 21:09:05 +02:00
Usha Mandya a3fb9a3999
Remove Toolbox advisory 2020-10-20 19:00:45 +01:00
Usha Mandya 2f0792503d
Update docker-for-windows/docker-toolbox.md
Co-authored-by: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
2020-10-20 18:56:00 +01:00
Usha Mandya 5275f249b4 Delete Toolbox files
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2020-10-20 18:43:55 +01:00
Sebastiaan van Stijn 82b0e8cb84
Merge pull request #11577 from mrl5/GH-11576
docker/docker.github.io#11576 fixed keywords for storage/storagedriver
2020-10-20 19:08:42 +02:00
Usha Mandya e885a5aeaa Remove Docker Toolbox docs
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
2020-10-20 18:05:36 +01:00
Usha Mandya 406d70a4b9
Merge pull request #11581 from thaJeztah/remove_broken_content
[Desktop] remove content refering to removed "osxfs" topic
2020-10-20 14:01:16 +01:00
Sebastiaan van Stijn 92e2068c38
[Desktop] remove content refering to removed "osxfs" topic
This topic was removed in 9bebb666d9

We may want to add back the part describing sharing sshagent somewhere,
which is not really a feature related to osxfs. Also, some generic
description about file sharing (permissions, syncing) should probably
be added back.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 14:08:46 +02:00
Usha Mandya f3412acfe5
Merge pull request #11578 from binman-docker/master
Add other limit info and more 3rd parties
2020-10-20 12:24:08 +01:00
Usha Mandya a9f706b270
Minor style updates 2020-10-20 11:56:30 +01:00
Usha Mandya 5c93b26ca9
Merge pull request #11583 from thaJeztah/remove_unused_images
[desktop] remove some unused images
2020-10-20 11:34:36 +01:00
Usha Mandya 0881f4a12a
Merge pull request #11572 from djs55/docker-for-mac-filesharing
Improve Docker Desktop filesharing docs
2020-10-20 11:28:07 +01:00
Usha Mandya bba548e868
Merge pull request #11582 from thaJeztah/remove_mutagen
[desktop] remove mutagen content
2020-10-20 11:27:43 +01:00
Usha Mandya e79903c436
Merge pull request #11579 from thaJeztah/notes_cleanup
Notes styles cleanup, and add background color to regular notes
2020-10-20 11:22:33 +01:00
Usha Mandya 0e8c1b63ff
Minor style updates 2020-10-20 11:18:18 +01:00
Usha Mandya eb8e33f321
Minor style updates 2020-10-20 11:12:17 +01:00
Sebastiaan van Stijn b6fcb46f74
[desktop] remove some unused images
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 11:35:23 +02:00
Sebastiaan van Stijn 01dade0652
[desktop] remove mutagen content
It was already redirected to the docker for mac landing page.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-20 11:23:19 +02:00
Sebastiaan van Stijn d96cb12828
Update default background color for notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-19 22:24:37 +02:00
Sebastiaan van Stijn 34fc160c9e
_scss: cleanup notes styles
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-19 22:13:49 +02:00
Sebastiaan van Stijn 204d4df024
_scss: reformat _variables.scss, and unify colors in variables file
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-10-19 21:56:05 +02:00
Brett Inman 98549b194e
Merge branch 'master' into master 2020-10-19 12:26:50 -07:00
mrl5 9242ec4525
docker/docker.github.io#11576 fixed keywords for storage/storagedriver 2020-10-19 21:17:30 +02:00