Skip to content

Move the workhorse container to be based on gitlab-base

DJ Mountney requested to merge move-workhorse-to-base into master
  • Not longer pull in ruby into the image

This matches the change that was made in CNG for 15.4 - CNG!1097 (merged)

How to verify

Check out branch, then run the subrepo clone and sync

./clone.sh
./sync-branch.sh

Then run the release helper script for the v15.4.0-ubi8 release and ensure it completes successfully

./release-helper.sh v15.4.0-ubi8
echo $?

Navigate to the repo1/gitlab-workhorse directory and confirm the dockerfile and manifest file has the expected base image

If the upstream MR hasn't been merged yet, you can also run ./show-diff.sh to see all the changes between the latest repo1 release and the v15.4.0-ubi8 branch. But if it shows nothing, then it means the 15.4.0 changes have already been merged upstream. (hence why manually checking the workhorse files is ideal)

Optionally you can also run a local docker build to confirm the workhorse image builds locally:

./clean-build.sh
./build-script.sh v15.4.0-ubi8 "gitlab-base,gitlab-workhorse"
Edited by DJ Mountney

Merge request reports