Skip to content

images: Remove references to CoreOS Terraform #35

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.

Sign up for GitHub

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

Merged
openshift-merge-robot merged 1 commit into from
Jul 25, 2018
+4 −26
Merged

images: Remove references to CoreOS Terraform #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions images/tectonic-builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
###
# Update the builder image manually by running:
# (See README.md/##Upstream-and-CoreOS-Terraform)
#
# docker build -t quay.io/coreos/tectonic-builder:<next-semver> -f images/builder/Dockerfile .
# docker push quay.io/coreos/tectonic-builder:<next-semver>
#
# docker build \
# --build-arg TERRAFORM_URL=<upstream terraform download url> \
# -t quay.io/coreos/tectonic-builder:<next-semver>-upstream-terraform \
# -f images/builder/Dockerfile .
# docker push quay.io/coreos/tectonic-builder:<next-semver>-upstream-terraform
###

FROM golang:1.9.2-stretch
Expand Down Expand Up @@ -47,8 +40,6 @@ RUN mkdir -p ${HOME} && \
openvpn xauth

# Install Terraform
# TERRAFORM_URL enables us to build the upstream-terraform Tectonic builder
# image (See README.md/##Upstream-and-CoreOS-Terraform)
ARG TERRAFORM_URL=https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip
RUN curl -L ${TERRAFORM_URL} | funzip > /usr/local/bin/terraform && chmod +x /usr/local/bin/terraform

Expand Down
18 changes: 4 additions & 14 deletions images/tectonic-builder/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,8 @@ This container image contains the environment required to build and test the
of CI/CD pipelines. More particularly, this image is used in several Jenkins
jobs today for testing purposes.

## Upstream and CoreOS Terraform

The Tectonic CI is currently using a custom Terraform version for the default
pipeline (See https://github.com/coreos/tectonic-installer/pull/1247). As end
users of Tectonic installer use upstream Terraform we need to test with upstream
Terraform as well. We are building and publishing the Tectonic builder image
both with CoreOS Terraform as well as upstream Terraform. This is done via
docker `--build-arg` `TERRAFORM_URL`. CoreOS Terraform is used for normal PR and
branch tests, upstream Terraform is used once per day on master.

Example:
- CoreOS Terraform (default):
`docker build -t quay.io/coreos/tectonic-builder:v1.33 -f images/tectonic-builder/Dockerfile .`
- Upstream Terraform:
`docker build -t quay.io/coreos/tectonic-builder:v1.33-upstream-terraform --build-arg TERRAFORM_URL=https://releases.hashicorp.com/terraform/0.9.11/terraform_0.9.11_linux_amd64.zip -f images/tectonic-builder/Dockerfile .`

```sh
docker build -t quay.io/coreos/tectonic-builder:v1.33 -f images/tectonic-builder/Dockerfile .
```
3 changes: 0 additions & 3 deletions images/tectonic-installer/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ WORKDIR /go/src/github.com/openshift/installer
COPY . .
### Install Terraform
ENV TERRAFORM_VERSION="0.11.1"
# Install Terraform
# TERRAFORM_URL enables us to build the upstream-terraform Tectonic builder
# image (See README.md/##Upstream-and-CoreOS-Terraform)
ARG TERRAFORM_URL=https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip

RUN go build -o ./installer/tectonic ./installer/cmd/tectonic && \
Expand Down