Skip to content

[19.03 backport] various dockerfile changes and update to buster variant#40558

Merged
cpuguy83 merged 16 commits intomoby:19.03from
thaJeztah:19.03_backport_buster_or_bust
Mar 12, 2020
Merged

[19.03 backport] various dockerfile changes and update to buster variant#40558
cpuguy83 merged 16 commits intomoby:19.03from
thaJeztah:19.03_backport_buster_or_bust

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Feb 22, 2020

This backports various changes from master to the 19.03 branch, some of which are in preparation of updating to Go 1.13, others to reduce formatting differences to make comparing slightly easier.

Note that in this variant, I did not include the Dockerfile changes to the "buildkit + buildx optimized" version (#39340); as a result, some (formatting) changes did not apply cleanly.

If we think the buildkit optimized version should be considered, I can open a variant with that PR (and related/follow-up PRs) included.

@thaJeztah thaJeztah added area/testing area/project kind/refactor PR's that refactor, or clean-up code labels Feb 22, 2020
@thaJeztah thaJeztah added this to the 19.03.8 milestone Feb 22, 2020
@thaJeztah thaJeztah marked this pull request as ready for review February 22, 2020 18:34
@thaJeztah thaJeztah requested a review from tianon as a code owner February 22, 2020 18:34
Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the :sort! 💪

zip \
&& rm -rf /var/lib/apt/lists/*

# Switch to use iptables instead of nftables (to match the host machine)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice if we could somehow detect this and use the appropriate version accordingly instead of just assuming the host uses iptables 😞

(maybe a TODO for if/when we support nftables?)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah; this one was mostly taking from what's on master, but I agree that this is pretty much hard coded to the machines we currently have running in our CI

Perhaps you could open a quick PR on master to add the TODO (and a corresponding tracking issue?)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh doh, forgot this was a backport, sorry! Will do! 👍

@thaJeztah
Copy link
Copy Markdown
Member Author

I attached this to the 19.03.8 milestone, as it's not critical for 19.03.7; I suggest we merge this one after 19.03.7 is tagged and done

thaJeztah and others added 14 commits March 12, 2020 18:48
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 961119d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This is an attempt to fix go-swagger panic under Golang 1.13.

Details:
 * go-openapi/jsonpointer#4
 * go-swagger/go-swagger#2059

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 93f9b90)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This reverts commit 0d4f412.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Justen Martin <jmart@the-coder.com>
(cherry picked from commit 095ca77)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
With this change, go packages/modules that use versioned
import paths (github.com/foo/bar/v2), but don't use a directory
in the repository, can now be supported.

For example:

```
github.com/coreos/go-systemd/v22 v22.0.0
```

will vendor the github.com/coreos/go-systemd repository
into `vendor/github.com/coreos/go-systemd/v22`.

full diff: LK4D4/vndr@f5ab8fc...v0.1.0

- LK4D4/vndr#83 migrate bitbucket to api 2.0
    - fixes LK4D4/vndr#82 https://api.bitbucket.org/1.0/repositories/ww/goautoneg: 410 Gone
- LK4D4/vndr#86 Replace sort.Sort with sort.Strings
- LK4D4/vndr#87 support `github.com/coreos/go-systemd/v22`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d4f05c1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: https:/github.com/LK4D4/vndr/compare/v0.1.0...v0.1.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 486161a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Match the position with where it's on master after the
Dockerfile buildkit refactor.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Indenting with tabs can cause the formatting to go wonky,
because the first line of any command is "indented" with spaces,
but following lines are not, therefore they can be mis-aligned with
the first line.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a42b414)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 1cfcce5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ee0ef6c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Ordering the COPY lines to optimize for layer sharing
when these dependencies are updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8edbe5d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 93edf32)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
```
 ---> Making bundle: .integration-daemon-stop (in bundles/test-integration)
 ++++ cat bundles/test-integration/docker.pid
 +++ kill 13137
 +++ /etc/init.d/apparmor stop
 Leaving: AppArmorNo profiles have been unloaded.

 Unloading profiles will leave already running processes permanently
 unconfined, which can lead to unexpected situations.

 To set a process to complain mode, use the command line tool
 'aa-complain'. To really tear down all profiles, run 'aa-teardown'."

script returned exit code 255
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5dbfae6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
… packages

The btrfs-tools was a transitional package, and no longer exists:

> Package btrfs-tools
> stretch (oldstable) (admin): transitional dummy package
> 4.7.3-1: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x

It must be replaced either by `btrfs-progs` or `libbtrfs-dev` (which has just the development headers)

> Package: libbtrfs-dev (4.20.1-2)
> Checksumming Copy on Write Filesystem utilities (development headers)

Note that the `libbtrfs-dev` package is not available on Debian stretch
(only in stretch-backports)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4e3ab9e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
CI runs on Ubuntu 16.04 machines, which use iptables (legacy), but
Debian buster uses nftables. Because of this, DNS resolution does not
work if the daemon configures iptables.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit bb0472b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: docker-archive/windows-container-utility@e004a14...aa1ba87

changes:

- Use standard include paths instead of hard-coding

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5125f8b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 19.03_backport_buster_or_bust branch from d7c86a6 to 57d5105 Compare March 12, 2020 17:49
@thaJeztah
Copy link
Copy Markdown
Member Author

Rebased; to get cherry-picks to be as clean as possible, I reverted 0d4f412, and is re-applied after that. Happy to instead just modify the commits to resolve the conflicts.

PTAL

Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cpuguy83 cpuguy83 merged commit 4a4b3ed into moby:19.03 Mar 12, 2020
@thaJeztah thaJeztah deleted the 19.03_backport_buster_or_bust branch March 12, 2020 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/project area/testing kind/refactor PR's that refactor, or clean-up code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants