Skip to content

Use simpler base image on rspec jobs with upgrading Docker CLI from 19.03.1 to 20.10.5

Takuya Noguchi requested to merge 2651-use-simpler-base-image-on-rspec-jobs into master

What does this MR do?

It uses simpler base image on rspec jobs (#2651 (closed)) and upgrades Docker CLI from 19.03.1 to 20.10.5 (#2664 (closed)).

While !667 (merged) introduced Feature spec on the project CI with registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1, it is better to use the well-maintained image instead on feature spec in CI.

As the new image has been used in gitlab-org/gitlab, the image would be maintained well in the future.

Before this MR, (while PG server is on 13.x) PG 11.9 was used in client side from buster: https://packages.debian.org/buster/postgresql, but with this MR, PG (client) is upgraded from 11.9 (managed by Debian) to 11.11 (managed by the upstream).

Also the pre-built image of PostgreSQL would make CI faster.

Smaller image

2.16GB => 1.97GB

$ docker images
REPOSITORY                                           TAG                                                                                                                  IMAGE ID            CREATED             SIZE
registry.gitlab.com/gitlab-org/gitlab-build-images   ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36   e209d00783d1        2 weeks ago         1.97GB
registry.gitlab.com/gitlab-org/gitlab-build-images   ruby-2.7.2-git-2.29-chrome-85-node-12.18-yarn-1.22-docker-19.03.1                                                    8697bd1bb694        4 months ago        2.16GB

PG version

before

psql (PostgreSQL) 11.9 (Debian 11.9-0+deb10u1)

after

psql (PostgreSQL) 11.11 (Debian 11.11-1.pgdg90+1)

Related issues

Closes #2651 (closed) #2664 (closed)

Part of gitlab-org/gitlab-build-images#70 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
Edited by Takuya Noguchi

Merge request reports