Skip to content
This repository has been archived by the owner on Oct 7, 2021. It is now read-only.

WIP: Provide basis for new API; move to environment configuration style #179

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,10 @@ docs/local/
*pip-selfcheck.json
*.retry
docs/virtualenv/
api/exp/generated/
*.pem
*.csr
*buildinfo.go
tmpdb/
coverage.html

24 changes: 21 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.9 AS build
FROM golang:1.10 as build-env
MAINTAINER Matt Oswalt <[email protected]> (@mierdin)

LABEL version="0.1"
Expand All @@ -12,13 +12,24 @@ RUN mkdir -p /opt/todd/server/assets/factcollectors
RUN mkdir -p /opt/todd/agent/assets/testlets
RUN mkdir -p /opt/todd/server/assets/testlets

RUN apt-get update \
&& apt-get install -y vim curl iperf git sqlite3 unzip

RUN curl -OL https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip && unzip protoc-3.2.0-linux-x86_64.zip -d protoc3 && chmod +x protoc3/bin/* && mv protoc3/bin/* /usr/local/bin && mv protoc3/include/* /usr/local/include/

# TODO(mierdin) How to install this vendored? Since we need the binary
RUN go get -u github.com/golang/protobuf/protoc-gen-go

# TODO(mierdin) Fix
RUN go get golang.org/x/net/context
RUN go get google.golang.org/grpc

# Install ToDD
COPY . /go/src/github.com/toddproject/todd

RUN cd /go/src/github.com/toddproject/todd && GO15VENDOREXPERIMENT=1 make && make install

RUN cp /go/src/github.com/toddproject/todd/etc/* /etc/todd


# Create runtime container
FROM debian:jessie

Expand All @@ -37,3 +48,10 @@ COPY --from=build /go/bin/todd* /usr/local/bin/
COPY --from=build /etc/todd/* /etc/todd/

CMD ["/usr/local/bin/todd"]

# Copy binaries into new minimalist image
# TODO(mierdin): DNS lookups not working right in scratch. I tried debian and it just blew chunks. Need to look into a solution for this
# FROM scratch
# COPY --from=build-env /go/bin/syringed /usr/bin/syringed
# COPY --from=build-env /go/bin/syrctl /usr/bin/syrctl
# CMD ["/usr/bin/syringed"]
106 changes: 0 additions & 106 deletions Godeps/Godeps.json

This file was deleted.

5 changes: 0 additions & 5 deletions Godeps/Readme

This file was deleted.

225 changes: 225 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading