Commit Graph

53977 Commits

Author SHA1 Message Date
Jérémie Drouet 3b635b1996
ci: copy static files to s3 on master build
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-03-12 15:52:22 +01:00
Usha Mandya 6d2300a89f
Merge pull request #10435 from tiborvass/19.03.8-release-notes
engine: add release notes for 19.03.8
2020-03-12 11:00:19 +00:00
Tibor Vass 03eba805e5 engine: add release notes for 19.03.8
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-03-11 20:41:57 +00:00
Usha Mandya 6d1915a928
Update links to get-started docs (#10430) 2020-03-11 09:46:54 +00:00
Usha Mandya fefc750abd
Update Hub support alias (#10432) 2020-03-10 18:30:43 +00:00
Traci Morrison 4c5d0807b5
Add details for March patch release (#10424) 2020-03-10 17:09:44 +00:00
Dawn-Docker Enterprise 71b66710b4
DTR release notes for March 2020 Amberjack patch release (#10425)
* DTR release notes for March 2020 Amberjack patch release

* updating dtr and ucp product versions and links to tarballs

* fixing typo

Co-authored-by: Dawn W Docker <dawn.wood@users.noreply.github.com>
2020-03-10 17:09:25 +00:00
ZakGier 1927e87890
Added missing character to example repository name (#10423) 2020-03-09 16:20:29 +00:00
scott-vsi e7eedf3b7f
fix link (#10402)
fix a link that was possibly broken by automatic text formatting/wrapping
2020-03-09 10:19:45 +00:00
Sebastiaan van Stijn 7caf4095a4
Merge pull request #10416 from pcworld/patch-2
rootless.md: Fix typo in path
2020-03-07 19:19:18 +01:00
Sebastiaan van Stijn 003015a035
Merge pull request #10417 from imba-tjd/patch-1
Chore: Fix indentation
2020-03-07 16:12:13 +01:00
谭九鼎 8bf6e38700
Chore: Fix indentation 2020-03-07 21:13:11 +08:00
pcworld e1f41c15ed
rootless.md: Fix typo in path 2020-03-06 18:47:46 +01:00
Jérémie Drouet fdd7d5bfb0
Merge pull request #10413 from jdrouet/disable-deploy-fork
fork shouldn't trigger deploy
2020-03-06 14:18:08 +01:00
Jérémie Drouet f2e1c94e9e ci: fork shouldn't trigger deploy
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-03-06 11:03:50 +01:00
Usha Mandya 2baaa9e2c3
Merge pull request #10406 from tiborvass/19.03.6-7-release-notes
engine: add release notes from 19.03.6 and 19.03.7
2020-03-05 18:55:08 +00:00
Tibor Vass 74c2b55bf1 engine: add release notes from 19.03.6 and 19.03.7
Signed-off-by: Tibor Vass <tibor@docker.com>
2020-03-05 18:47:37 +00:00
Sebastiaan van Stijn cb18c6c65a
Merge pull request #10374 from thaJeztah/dockerfile_fixes
Dockerfile fixes and optimisations
2020-03-04 15:02:33 +01:00
Usha Mandya 7f69c52caf
Merge pull request #10398 from docker/gh-pr-netlify
Gh pr netlify
2020-03-04 11:37:05 +00:00
Jérémie Drouet 22a6ee2479 ci: clean netlify when PR get closed or merged
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-03-04 09:04:57 +01:00
Usha Mandya 1404e76916
Merge pull request #10375 from thaJeztah/archive_redirects
NGINX config: add redirect rules for obsolete archive pages
2020-03-03 17:38:04 +00:00
Usha Mandya a8ec701fee
Add note on Windows Home support on Edge (#10393) 2020-03-03 16:34:49 +00:00
Takuya N a28ede6e59
Fix typos in Docker Hub Publisher docs (#10392)
https://docs.docker.com/docker-hub/publish/publish/
https://docs.docker.com/docker-hub/publish/publisher_faq/

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2020-03-03 16:19:26 +00:00
Sebastiaan van Stijn 0caed8aeb5
Remove old information about classic swarm discovery (#10391)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-03 16:18:08 +00:00
Jérémie Drouet 802c071377 ci: deploy static to netlify
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-03-03 14:33:46 +01:00
Sebastiaan van Stijn 472545f5a7
Merge pull request #10387 from StefanScherer/update-edge-for-wsl2
Download Edge version via Docker Hub
2020-03-03 12:47:18 +01:00
Stefan Scherer 66ff80399d
Download Edge version via Docker Hub
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2020-03-03 12:07:13 +01:00
Mathieu Champlon f4af5b2a44
Fix Windows URL typo (#10385) 2020-03-02 18:10:48 +00:00
Usha Mandya 222aec866f
Desktop Edge 2.2.2.0 release notes (#10345)
* Desktop Edge 2.2.2.0 release notes

* Added new relnote entries

* adding release date and download url
2020-03-02 11:44:46 +00:00
Jérémie Drouet 95652e0b3d
Merge pull request #10369 from jdrouet/gh-actions
ensure project can be built for each PR
2020-03-02 08:30:56 +01:00
Sebastiaan van Stijn 628b77dc82
NGINX config: add redirect rules for obsolete archive pages
This adds redirect rules to redirect URLs for archives that are no longer hosted
to the current documentation.

Some test scenarios below to verify:

Current docs
--------------------------------------------------------------------------------

- http://localhost:4000/engine/reference/commandline/create
    - redirects to http://localhost:4000/engine/reference/commandline/create/ (with trailing slash)
- http://localhost:4000/engine/reference/commandline/create/
- http://localhost:4000/engine/reference/commandline/create/index.html

Archived docs for current archives (e.g. v18.09):
--------------------------------------------------------------------------------

- http://localhost:4000/v18.09/engine/reference/commandline/create
  - ideally this should redirect to http://localhost:4000/v18.09/engine/reference/commandline/create/ (with trailing slash)
- http://localhost:4000/v18.09/engine/reference/commandline/create/
- http://localhost:4000/v18.09/engine/reference/commandline/create/index.html

Non-existing pages
--------------------------------------------------------------------------------

These should produce a 404 (not found)

- http://localhost:4000/no/such/page/
- http://localhost:4000/v18.09/no/such/page/
    - redirects to http://localhost:4000/no/such/page/

URLs for archived versions that are not, or no longer, published
--------------------------------------------------------------------------------
These are not found, because we don't (or no longer) publish these archive versions.
Because they start with `/vXX.XX/`, we redirect them to the same location in the
current docs. Note that the location redirected to may not (or no longer) exist,
and as such could result in another 301 redirect, or a ultimately a 404 ("not found").

Given that these should not re-appear, these redirects use a 301 (permanent). There
is one corner case; URLs for _future_ releases (e.g. `/v20.03/`) will _also_ produce
a 301, which could be cached by browsers / proxies, and effectively "block" the
URL for future use. I don't think this is very problematic, or at least not
something we should care about.

- http://localhost:4000/v17.99/engine/reference/commandline/run
    - redirects to http://localhost:4000/engine/reference/commandline/run/ in the current docs
- http://localhost:4000/v17.99/engine/reference/commandline/run/
    - redirects to http://localhost:4000/engine/reference/commandline/run/ in the current docs
- http://localhost:4000/v17.99/engine/reference/commandline/run/index.html
    - redirects to http://localhost:4000/engine/reference/commandline/run/index.html  in the current docs

Non existing pages in archive paths
--------------------------------------------------------------------------------

- http://localhost:4000/v17.03/no/such/page/
    - redirects to http://localhost:4000/no/such/page/ in the current docs
    - which shows a 404 not found page

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 15:10:24 +01:00
Sebastiaan van Stijn f0e03927c8
NGINX config: enable aio
Enable aio for better performance (see https://www.nginx.com/blog/thread-pools-boost-performance-9x/)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 15:10:22 +01:00
Sebastiaan van Stijn e73356f7cd
NGINX configuration: define "root" and "index" at server level
It's best-practice to not define these inside a "location" block
to prevent having to re-define them for each location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 15:10:20 +01:00
Sebastiaan van Stijn a94d10bdd2
NGINX configuration: use relative redirects
Use relative redirects to account for situations where a front-end
proxy is used and the container does not know the public domain and
port.

Before this change, when running locally (on localhost:4000), redirects would omit
the port number, and redirect to localhost _without_ port number:

    curl -v "http://localhost:4000/engine/reference/commandline/run"
    * TCP_NODELAY set
    * Connected to localhost (::1) port 4000 (#0)
    > GET /engine/reference/commandline/run HTTP/1.1
    > Host: localhost:4000
    > User-Agent: curl/7.65.3
    > Accept: */*
    >
    * Mark bundle as not supporting multiuse
    < HTTP/1.1 301 Moved Permanently
    < Server: nginx/1.17.8
    < Date: Fri, 28 Feb 2020 13:46:10 GMT
    < Content-Type: text/html
    < Content-Length: 169
    < Location: http://localhost/engine/reference/commandline/run/
    < Connection: keep-alive

After this change, redirect will be "relative", so redirecting to the correct location:

    curl -v "http://localhost:4000/engine/reference/commandline/run"
    * TCP_NODELAY set
    * Connected to localhost (::1) port 4000 (#0)
    > GET /engine/reference/commandline/run HTTP/1.1
    > Host: localhost:4000
    > User-Agent: curl/7.65.3
    > Accept: */*
    >
    * Mark bundle as not supporting multiuse
    < HTTP/1.1 301 Moved Permanently
    < Server: nginx/1.17.8
    < Date: Fri, 28 Feb 2020 13:39:02 GMT
    < Content-Type: text/html
    < Content-Length: 169
    < Connection: keep-alive
    < Location: /engine/reference/commandline/run/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 15:10:17 +01:00
Sebastiaan van Stijn 20267e58b9
prevent fetching resources when updating _config.yml or toc.yaml
The "fetch-upstream-resources" script also updated the toc.yaml,
based on values in the _config.yml.

As a result, any change in either the "_config.yml" or "toc.yaml"
would also result in the upstream resources to be fetched again.

This patch separates the step to update the toc, so that the
upstream resources can be cached. This _does_ mean that remote
sources can get outdated (only will be rebuilt when changing
ENGINE_BRANCH or DISTRIBUTION_BRANCH). That should not be a
problem for actual deployments, which don't use caching.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 14:18:17 +01:00
Sebastiaan van Stijn ab9fe6e98e
Dockerfile: remove "deploybase" stage, and inline instead
The "deploybase" stage was only used for the final stage.

This patch inlines the steps from that stage to the final stage
itself. In the process, changing the order of copying the NGINX
configuration file to _after_ the docs were copied. This prevents
having to copy the archived docs when making a change in the NGINX
configuration. The NGINX configuration file _will_ now be copied
on each rebuild, but the file is small, and as such is still faster
than copying all archives.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 14:17:20 +01:00
Sebastiaan van Stijn 40e5ab6009
Dockerfile: don't use intermediate "deploy-source" stage
The "deploy-source" stage was added in a previous refactor. While
this stage is useful to "export" all docs (including archives if
needed), and _convenient_ to collect all those files to the final
stage, it caused a regression in performance.

This patch changes the final ("deploy") to copy the "archives" and
"current" docs separately, so that the archived versions can be
cached in the final stage, and don't have to be copied again on
each rebuild.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 14:17:18 +01:00
Sebastiaan van Stijn 7d22d25adf
fetch-upstream-resources: simplify parsing of _config.yml
This part of the script was setting variables for any "_version"
property in the configuration file.

We (currently) only need the engine API version, so simplifying
the code to just do that, and fix some spaces -> tabs indentations.

With this change the script only uses standard (POSIX) scripting,
so switching to use the standard (/bin/sh) shell.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 14:17:11 +01:00
Sebastiaan van Stijn f12fb8302f
fetch-upstream-resources: remove dead code for "LOCAL" variable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 14:16:45 +01:00
Sebastiaan van Stijn adfdc8e0a0
fetch-upstream-resources: fix check for svn vars
These checks were now checking the literal "engine_svn_branch" and
"distribution_svn_branch" string, instead of the value of the variables.

This was introduced in 1f7d4ce871 (whoops!)

We currently don't use this functionality, so not a critical bug.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 14:16:43 +01:00
Jérémie Drouet 41495fe4d1 ci: ensure project can be built for each PR
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2020-02-28 09:01:33 +01:00
Sebastiaan van Stijn 820a2242d1
Merge pull request #10363 from logankimmel/patch-3
fix update docker command
2020-02-27 23:28:46 +01:00
Usha Mandya 22da7572d7
Update tables from html to markdown format (#10360) 2020-02-27 10:34:24 +00:00
Usha Mandya a68383b33a
Merge pull request #10361 from mat007/windows-new-file-sharing
Remove obsolete file sharing information
2020-02-27 10:08:50 +00:00
Logan Kimmel 58aa5fb648
fix update docker command
If you supply the `--interactive` flag to `docker run` the prompt will never come back. That said, if somebody were to run this as a cron job, it would fail as the `ucp-phase2` container name will already exist.
2020-02-26 19:48:38 -07:00
Mathieu Champlon 8b58bcc00a Remove obsolete file sharing information 2020-02-26 12:11:50 +01:00
Usha Mandya adc18eed2f
Merge pull request #10341 from eug48/patch-1
update registry s3 storage driver docs to add skipverify flag
2020-02-26 11:06:47 +00:00
Usha Mandya 4112ce3b0a
Merge pull request #10353 from arueth/master
[ee/ucp/admin/install/plan-installation] Adding additional information to the 'Avoid IP range conflicts' section
2020-02-26 10:10:17 +00:00
Aaron Rueth 017b955cfd Adding additional information to the 'Avoid IP range conflicts' section 2020-02-25 13:47:53 -08:00
Usha Mandya f6b590cbb3
Merge pull request #10351 from thaJeztah/use_local_nginx_conf
Dockerfile: use local nginx configuration
2020-02-25 17:35:59 +00:00