Use different Golang version while building Agent for Windows #2688
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
angelcar
reviewed
Oct 22, 2020
shubham2892
reviewed
Oct 22, 2020
mythri-garaga
force-pushed
the
dev
branch
2 times, most recently
from
38d94e1 to
7020708
Compare
angelcar
reviewed
Oct 23, 2020
angelcar
reviewed
Oct 23, 2020
scripts/dockerfiles/Dockerfile.build
Outdated
| @@ -11,7 +11,8 @@ | |||
| # express or implied. See the License for the specific language governing | |||
| # permissions and limitations under the License. | |||
|
|
|||
| FROM golang:1.12 | |||
| ARG GO_VERSION=1.15 | |||
There was a problem hiding this comment.
I would like to know what others think, but I'd rather not use a default value so that if our main makefile is wrong, the rest of the make files would fail, instead of silently using go 1.15.
angelcar
reviewed
Oct 26, 2020
| @@ -71,11 +77,17 @@ docker: certs build-in-docker pause-container-release cni-plugins .out-stamp | |||
| @docker build -f scripts/dockerfiles/Dockerfile.release -t "amazon/amazon-ecs-agent:make" . | |||
| @echo "Built Docker image \"amazon/amazon-ecs-agent:make\"" | |||
|
|
|||
| ifeq (${TARGET_OS},windows) | |||
| BUILD="cleanbuild-${TARGET_OS}" | |||
There was a problem hiding this comment.
Is this variable still needed?
There was a problem hiding this comment.
This will be useful when we are playing with the scripts locally.
shubham2892
approved these changes
Oct 27, 2020
angelcar
approved these changes
Oct 27, 2020
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Use different Golang version while building Agent for Windows
Implementation details
Makefile, targetdocker-releaseis modified to use different dockerfiles based on OSTesting
Tested the build produced by
make codebuildon Windows2016. Agent joined the cluster successfully.New tests cover the changes:
Description for the changelog
Bug - Fixed Makefile to use Go1.12 for Agent windows build
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.