Skip to content

[18.03 backport] fetch resources use tags#10349

Merged
usha-mandya merged 18 commits intodocker:v18.03from
thaJeztah:18.03_backport_fetch_resources_use_tags
Feb 26, 2020
Merged

[18.03 backport] fetch resources use tags#10349
usha-mandya merged 18 commits intodocker:v18.03from
thaJeztah:18.03_backport_fetch_resources_use_tags

Conversation

@thaJeztah
Copy link
Member

backport of #10101 and related changes

I tested this locally with DOCKER_BUILDKIT=0, because the onbuild base image we're using in the archives don't seem to work well with buildkit enabled.

Given that backporting these changes is not trivial, I think we should skip the other archives, and accept them to be potentially "broken" (existing images on docker hub remain to work, but rebuilding them might not always be possible)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b35c875)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f3feee5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
When using Gnu Wget, the `--directory-prefix` option automatically
creates the specified path if it doesn't exist.

Note that this does not work when using the busybox version
of Wget (but we're not using that in our Dockerfile).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 3f165c6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d386c4c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This variable is no longer needed, as the scripts are
always executed relative to the current directory (`.`).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5d8ce07)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Add a `--quiet` flag to suppress progress output;

```
--2019-03-07 14:02:43--  https://raw.githubusercontent.com/docker/docker-ce/17.12/components/engine/api/swagger.yaml
Resolving raw.githubusercontent.com... 151.101.0.133, 151.101.64.133, 151.101.128.133, ...
Connecting to raw.githubusercontent.com|151.101.0.133|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 343126 (335K) [text/plain]
Saving to: './engine/api/v1.35/swagger.yaml'

     0K .......... .......... .......... .......... .......... 14% 2.97M 0s
    50K .......... .......... .......... .......... .......... 29% 6.10M 0s
   100K .......... .......... .......... .......... .......... 44% 6.22M 0s
   150K .......... .......... .......... .......... .......... 59% 6.32M 0s
   200K .......... .......... .......... .......... .......... 74% 6.15M 0s
   250K .......... .......... .......... .......... .......... 89% 6.11M 0s
   300K .......... .......... .......... .....                100% 6.82M=0.06s

2019-03-07 14:02:44 (5.37 MB/s) - './engine/api/v1.35/swagger.yaml' saved [343126/343126]
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0785a85)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f297c55)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d2504d3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 449d7c6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dc3c434)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a0c6b80)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5e3415c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1b63746)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8385091)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c7d08f8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e6c6560)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 80e46fe)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@usha-mandya usha-mandya merged commit dfd7e7c into docker:v18.03 Feb 26, 2020
@thaJeztah thaJeztah deleted the 18.03_backport_fetch_resources_use_tags branch February 26, 2020 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants