Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[19.03 backport] changes from master (step 2) #467

Merged
merged 12 commits into from
May 1, 2020
Merged

[19.03 backport] changes from master (step 2) #467

merged 12 commits into from
May 1, 2020

Commits on May 1, 2020

  1. rpm/Makefile: remove parameterization of Dockerfile 

    All images used are multi-arch now, so no need to parameterize

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 06ff3c2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    38461b5 View commit details
    Browse the repository at this point in the history

  2. rpm/Makefile: use DISTROS intermediate variable, similar to deb 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit ad03155)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    978232d View commit details
    Browse the repository at this point in the history

  3. Makefile: remove SOURCE_FILES, SOURCES variables 

    We were not currently using these to override, so may as well
remove them.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a6a8d77)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    af3fc34 View commit details
    Browse the repository at this point in the history

  4. remove fedora 28 because it is eol 

    End of life as of 2019-05-28: https://fedoramagazine.org/fedora-28-end-of-life/

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 235feec)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @andrewhsu @thaJeztah
    andrewhsu authored and thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    8069f72 View commit details
    Browse the repository at this point in the history

  5. Add Support for Centos-8 

    Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
(cherry picked from commit ec3b30b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    Arko Dasgupta authored and thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    23708e7 View commit details
    Browse the repository at this point in the history

  6. Undo baseurl string replace for altarch 

    Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com>
(cherry picked from commit 8b4a45a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    Arko Dasgupta authored and thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    922a9f8 View commit details
    Browse the repository at this point in the history

  7. Fix CentOS 8 build 

    - Enable PowerTools repo
- Disable building btrfs, which is no longer supported on
  CentOS/RHEL

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit a03dda0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    f96d176 View commit details
    Browse the repository at this point in the history

  8. CentOS: fix failing repository on aarch64 (arm64) 

    This repository is only specified in the aarch64 (arm64) images,
and therefore was not caught in CI.

Bringing back the fix that was previously there, to prevent failures:

    docker#9 [stage-1 4/6] RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec
    docker#9 0.982 Loaded plugins: fastestmirror, ovl
    docker#9 1.177 Enabling base-source repository
    docker#9 1.177 Enabling extras-source repository
    docker#9 1.178 Enabling updates-source repository
    docker#9 1.179 Loading mirror speeds from cached hostfile
    docker#9 1.181  * base: d36uatko69830t.cloudfront.net
    docker#9 1.182  * extras: d36uatko69830t.cloudfront.net
    docker#9 1.182  * updates: d36uatko69830t.cloudfront.net
    docker#9 2.272 http://vault.centos.org/altarch/7/extras/Source/repodata/repomd.xml: [Errno 14] HTTP Error 404 - Not Found
    docker#9 2.272 Trying other mirror.
    docker#9 2.273 To address this issue please refer to the below wiki article

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 170199f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    eae0236 View commit details
    Browse the repository at this point in the history

  9. Add Fedora 32, remove Fedora 29 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit b6331a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    9038ae3 View commit details
    Browse the repository at this point in the history

  10. Add rhel for s390x 

    Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
(cherry picked from commit 6ea7ea0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @StefanScherer @thaJeztah
    StefanScherer authored and thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    a281b4c View commit details
    Browse the repository at this point in the history

  11. Remove Ubuntu 18.10 "cosmic", as it reached EOL 

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4a90d5a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    62084b8 View commit details
    Browse the repository at this point in the history

  12. Jenkinsfile: use docker/docker instead of docker/engine 

    The release branches have moved back to the upstream docker/docker
repository, so we should use that as source instead of the docker/engine
fork (and rely on it being synced with upstream)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 30635cb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 1, 2020
    Configuration menu
    Copy the full SHA
    f526324 View commit details
    Browse the repository at this point in the history