NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-08 17:42:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ashmckenzie-master-patch-0e34' into 'master'

Browse source 
Add comment about Golang and FIPS

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/782

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Ash McKenzie <amckenzie@gitlab.com>
This commit is contained in:
Stan Hu 2024-02-27 01:09:14 +00:00
commit 2a15b1419d
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -119,6 +119,15 @@ GitLab package registry. The install for Chrome will use registry to fetch corre
Make sure a certain version is cached before updating it in build jobs.
See `scripts/cache-google-chrome` for more details.
## Note regarding Golang and FIPS
When adding support for a new major/minor Golang version, we also need to
ensure there's a matching [`golang-fips`](https://github.com/golang-fips/)
branch available, e.g. for Golang 1.21 there's https://github.com/golang-fips/go/tree/go1.21-fips-release.
The `golang-fips` branch creation process can take time and so it
[may be necessary to use the previous version](https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/771)
until it's available.
## Contributing
See [Contributing](CONTRIBUTING.md)

2
scripts/lib/custom-docker-build
View file

@ -38,6 +38,8 @@ function print_image_args() {
function print_golang_args() {
declare -A GOLANG_DOWNLOAD_SHA256
# NOTE: See https://gitlab.com/gitlab-org/gitlab-build-images#note-regarding-golang-and-fips
# when adding a new major/minor Golang version.
case "$1" in
1.20)
INSTALL_GOLANG_VERSION=1.20.13 # Update scripts/install-golang for FIPS if this version is bumped