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.

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

Jump to bottom

Dockerfile changes for Terraform support #248

Merged
merged 3 commits into from
Oct 23, 2019
Merged

Dockerfile changes for Terraform support #248

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0aab78e
Dockerfile changes for Terraform support
maimaisie Oct 21, 2019
5f06456
Remove go dependency; chown /terraform
Oct 22, 2019
5238110
Bump TF provider to 1.3.0 to fix import;Also download K8s provider
Oct 23, 2019
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
27 changes: 25 additions & 2 deletions deploy/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,36 @@ RUN runDeps="sudo libsnappy-dev" \
&& apt-get install -y gnupg \
&& apt-get install -y curl \
&& apt-get install -y jq \
&& apt-get install -y wget
&& apt-get install -y unzip

# Install kubectl
# Install kubectl (to be removed once we switch to Terraform)
ADD https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl /usr/local/bin/kubectl
RUN chmod +x /usr/local/bin/kubectl
COPY setup/setup.sh /usr/bin/

# Install Terraform
ENV TERRAFORM_VERSION 0.12.12
RUN mkdir /tmp/terraform && \
curl https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -o /tmp/terraform/terraform.zip && \
cd /tmp/terraform && \
unzip terraform.zip && \
mv terraform /bin/terraform && \
chmod +x /bin/terraform && \
rm -rf /tmp/terraform

# Install sumologic provider and Kubernetes provider
ENV SUMO_PROVIDER_VERSION 1.3.0
ENV KUBERNETES_PROVIDER_VERSION 1.9.0
RUN mkdir -p /terraform && \
cd /terraform && \
curl -L https://github.com/SumoLogic/sumologic-terraform-provider/releases/download/v${SUMO_PROVIDER_VERSION}/sumologic-terraform-provider_${SUMO_PROVIDER_VERSION}_Linux_64-bit.zip -o terraform-provider-sumologic.zip && \
unzip terraform-provider-sumologic.zip && \
rm terraform-provider-sumologic.zip && \
curl -L https://releases.hashicorp.com/terraform-provider-kubernetes/${KUBERNETES_PROVIDER_VERSION}/terraform-provider-kubernetes_${KUBERNETES_PROVIDER_VERSION}_linux_amd64.zip -o terraform-provider-kubernetes.zip && \
unzip terraform-provider-kubernetes.zip && \
rm terraform-provider-kubernetes.zip && \
chown -R fluent /terraform

COPY --from=builder /usr/local/bundle /usr/local/bundle
COPY ./fluent.conf /fluentd/etc/
COPY ./entrypoint.sh /bin/
Expand Down