Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jan 24, 2024

also backports

go1.20.13 (released 2024-01-09) includes fixes to the runtime and the crypto/tls package. See the Go 1.20.13 milestone on our issue tracker for details:

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@codecov-commenter
Copy link

Codecov Report

Merging #4825 (73089f6) into 23.0 (3edca7e) will not change coverage.
Report is 1 commits behind head on 23.0.
The diff coverage is n/a.

Additional details and impacted files
@@           Coverage Diff           @@
##             23.0    #4825   +/-   ##
=======================================
  Coverage   58.62%   58.62%           
=======================================
  Files         286      286           
  Lines       24817    24817           
=======================================
  Hits        14549    14549           
  Misses       9388     9388           
  Partials      880      880           

@thaJeztah thaJeztah force-pushed the 23.0_update_golang_1.20.13 branch from 73089f6 to b1b48a4 Compare January 24, 2024 16:21
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit af05a68)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
We were depending on alpine's package repository to install compose,
but for debian we used compose's GitHub releases. Depending on distro
packages means that we don't know when updates will happen, and versions
may diverge because of that; for example, alpine 3.18 updated to compose
v2;

On alpine 3.17:

    make -f docker.Makefile build-e2e-image
    docker run --rm docker-cli-e2e docker-compose --version
    docker-compose version 1.29.2, build unknown

On alpine 3.18:

    make -f docker.Makefile build-e2e-image
    docker run --rm docker-cli-e2e docker-compose --version
    Docker Compose version v2.17.3

This caused our e2e script to fail, as it made assumptions about the name
format created by compose, which changed from underscores to hyphens in v2;

    Container cliendtoendsuite-engine-1  Running
    Error: No such object: cliendtoendsuite_engine_1

This patch:

- updates the Dockerfile to install compose from the compose-bin image
- adjusts the e2e script for the new naming scheme format
- removes the version field from the compose-files used in e2e, as they
  are no longer used by compose.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 9e424af)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
It's not needed to build these binaries. The Dockerfile.dev image already
has CGO_ENABLED=0 as default in the golang image, so does not need updates.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f07e7e1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This also moves `musl-dev` to the alpine-base stage, due to changes in
Alpine 3.18 causing gotestsum build to fail because stdlib.h was missing;

    docker#17 5.065 # runtime/cgo
    docker#17 5.065 In file included from _cgo_export.c:3:
    docker#17 5.065 /usr/include/fortify/stdlib.h:23:15: fatal error: stdlib.h: No such file or directory
    docker#17 5.065    23 | #include_next <stdlib.h>
    docker#17 5.065       |               ^~~~~~~~~~

alpine 3.17:

    / # find / | grep stdlib.h
    /usr/include/c++/12.2.1/tr1/stdlib.h
    /usr/include/c++/12.2.1/stdlib.h

alpine 3.18

    / # find / | grep stdlib.h
    /usr/lib/llvm16/lib/clang/16/include/__clang_hip_stdlib.h
    /usr/include/fortify/stdlib.h
    /usr/include/c++/12.2.1/tr1/stdlib.h
    /usr/include/c++/12.2.1/stdlib.h

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6a74a63)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
go1.20.13 (released 2024-01-09) includes fixes to the runtime and the crypto/tls
package. See the Go 1.20.13 milestone on our issue tracker for details:

- https://github.com/golang/go/issues?q=milestone%3AGo1.20.13+label%3ACherryPickApproved
- full diff: golang/go@go1.20.12...go1.20.13

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 23.0_update_golang_1.20.13 branch from b1b48a4 to 5aa844d Compare January 24, 2024 16:29
@thaJeztah thaJeztah changed the title [23..0] update to go1.20.13 [23.0] update to go1.20.13 Jan 24, 2024
@thaJeztah thaJeztah marked this pull request as ready for review January 25, 2024 09:54
@thaJeztah thaJeztah merged commit 672b149 into docker:23.0 Jan 25, 2024
@thaJeztah thaJeztah deleted the 23.0_update_golang_1.20.13 branch January 25, 2024 10:40
@thaJeztah thaJeztah modified the milestones: 23.0.9, 23.0.10 Jan 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants