Skip to content

Commit

Permalink
Uses golang docker image to test the go build
Browse files Browse the repository at this point in the history
  • Loading branch information
ivotron committed Dec 7, 2017
1 parent 8f3b332 commit 32d08df
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ language: bash
services: docker
script:
- ./build-me.sh
- ./popper/_check/build_images
- cd popper/_check && ./build_images
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Popper

[![Join the chat at https://gitter.im/systemslab/popper](https://badges.gitter.im/systemslab/popper.svg)](https://gitter.im/falsifiable-us/popper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build Status](https://travis-ci.org/systemslab/popper.svg?branch=master)](https://travis-ci.org/systemslab/popper) [![Join the chat at https://gitter.im/systemslab/popper](https://badges.gitter.im/systemslab/popper.svg)](https://gitter.im/falsifiable-us/popper?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Popper is a convention and CLI tool for generating reproducible papers. This repository contains:

Expand Down
6 changes: 2 additions & 4 deletions build-me.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ if [ -z "`which docker`" ]; then
exit 1
fi

docker run --rm -v `pwd`/popper:/app -w /app treeder/go vendor
docker run --rm -v `pwd`/popper:/app -w /app treeder/go build
docker build -t falsifiable/popper popper/

echo "Success. Popper is available at 'popper/app'."
echo "Note that the executable requires libc-musl: https://www.musl-libc.org/."
echo "Success. Popper is available at 'falsifiable/popper'."
8 changes: 3 additions & 5 deletions docs/protocol/intro_to_popper.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ shown below:
$> tree -a paper-repo/pipelines/myexp
paper-repo/pipelines/myexp/
|-- README.md
|-- .popper.yml
|-- run.sh
|-- setup.sh
|-- validate.sh
Expand All @@ -131,10 +130,9 @@ validation results is `[true|false] <statement>` (see examples below).
[false] network throughput is 2x the IO bandwidth
```

The [PopperCLI](https://github.com/systemslab/popper/popper) tool
includes a `pipeline init` subcommand that can be executed to scaffold
a pipeline with the above structure. The syntax of this command is the
following:
The [CLI](https://github.com/systemslab/popper/popper) tool includes a
`pipeline init` subcommand that can be executed to scaffold a pipeline
with the above structure. The syntax of this command is the following:

```bash
popper pipeline init <name>
Expand Down
15 changes: 6 additions & 9 deletions popper/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Before building, execute the following from the root folder of the project:
#
# docker run --rm -v `pwd`/popper:/app -w /app treeder/go vendor
# docker run --rm -v `pwd`/popper:/app -w /app treeder/go build

FROM iron/base
WORKDIR /app
COPY app /app/popper
ENTRYPOINT ["./popper"]
FROM golang:1.9
ADD . /go/src/github.com/systemslab/popper
WORKDIR /go/src/github.com/systemslab/popper
RUN go get ./
RUN go build
ENTRYPOINT ["/go/bin/popper"]

0 comments on commit 32d08df

Please sign in to comment.