Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swap ubuntu for alpine for terraform image build #282

Merged
merged 3 commits into from
Sep 16, 2019
Merged

Swap ubuntu for alpine for terraform image build #282

merged 3 commits into from
Sep 16, 2019

Conversation

mcrmonkey
Copy link
Contributor

Reduces need for installation of additional packages to perform basic
tasks during build time.

Same image build process as packer. alpine pinned to 3.9.

Reduces need for installation of additional packages to perform basic
tasks during build time.

Same image build process as packer. alpine pinned to 3.9.
@googlebot googlebot added the cla: yes CLA looks good label Aug 16, 2019
@leeonlee
Copy link
Collaborator

Hi, there was a recent merge that has some overlapping changes (using build_args to specify terraform version): #279

Please resolve conflicts and I'll take a look, thanks!

@mcrmonkey
Copy link
Contributor Author

Conflicts, I believe, are now corrected...

I've also adjusted the build-arg options so that they aren't just comping out as --build-arg 0.12.8 and instead are --build-args TERRAFORM_VERSION=0.12.8

terraform/Dockerfile Outdated Show resolved Hide resolved
- name: 'gcr.io/cloud-builders/docker'
env:
- 'TERRAFORM_VERSION=${_TERRAFORM_VERSION}'
- 'TERRAFORM_VERSION_SHA256SUM=${_TERRAFORM_VERSION_SHA256SUM}'
args:
- build
- --build-arg
- TERRAFORM_VERSION
- TERRAFORM_VERSION=${_TERRAFORM_VERSION}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've also adjusted the build-arg options so that they aren't just comping out as --build-arg 0.12.8 and instead are --build-args TERRAFORM_VERSION=0.12.8

I'm under the impression that the build-arg was not incorrect but I have no strong opinion here either:

"You may also use the --build-arg flag without a value, in which case the value from the local environment will be propagated into the Docker container being built" link

@leeonlee leeonlee merged commit fe1ae32 into GoogleCloudPlatform:master Sep 16, 2019
@leeonlee
Copy link
Collaborator

Thanks for the contribution!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes CLA looks good
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants