Skip to content

Commit

Permalink
Merge branch 'master' of github.com:alexei-led/pumba
Browse files Browse the repository at this point in the history
  • Loading branch information
alexei-led committed Mar 12, 2018
2 parents db9c453 + ab2943b commit 537d77d
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

- issue [52](https://github.com/gaia-adm/pumba/issues/52) fixed `netem` qdisc, when using with IP filter
- issue [52](https://github.com/alexei-led/pumba/issues/52) fixed `netem` qdisc, when using with IP filter
- documentation fix

### Changed
Expand All @@ -18,7 +18,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

- issue [39](https://github.com/gaia-adm/pumba/issues/39) fixed, when all traffic blocked after applying `netem` `qdisc` with IP `filter`
- issue [39](https://github.com/alexei-led/pumba/issues/39) fixed, when all traffic blocked after applying `netem` `qdisc` with IP `filter`

## [v0.4.3] - 2017-07-06

Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ RUN go get -v github.com/aktau/github-release && \
go get -v github.com/jstemmer/go-junit-report

# set working directory
RUN mkdir -p /go/src/github.com/gaia-adm/pumba
WORKDIR /go/src/github.com/gaia-adm/pumba
RUN mkdir -p /go/src/github.com/alexei-led/pumba
WORKDIR /go/src/github.com/alexei-led/pumba

# copy sources (including .git repo)
COPY . .
Expand All @@ -38,7 +38,7 @@ RUN if [[ "$RELEASE" == true ]]; then VERSION=$(cat VERSION) script/gox_build.sh

# release to GitHub; pass GITHUB_TOKEN as build-arg
ARG GITHUB_TOKEN
RUN if [[ "$RELEASE" == true ]]; then RELEASE_TAG=$(git describe --abbrev=0) TAG_MESSAGE="$(git tag -l $RELEASE_TAG -n 20 | awk '{$1=""; print}')" script/github_release.sh gaia-adm pumba; fi
RUN if [[ "$RELEASE" == true ]]; then RELEASE_TAG=$(git describe --abbrev=0) TAG_MESSAGE="$(git tag -l $RELEASE_TAG -n 20 | awk '{$1=""; print}')" script/github_release.sh alexei-led pumba; fi

#
# ------ Pumba runtime image ------
Expand All @@ -51,12 +51,12 @@ RUN addgroup pumba && adduser -s /bin/bash -D -G pumba pumba

RUN apk add --no-cache dumb-init su-exec

COPY --from=builder /go/src/github.com/gaia-adm/pumba/dist/bin/pumba /usr/bin/pumba
COPY --from=builder /go/src/github.com/alexei-led/pumba/dist/bin/pumba /usr/bin/pumba
COPY docker_entrypoint.sh /

ENTRYPOINT ["dumb-init", "/docker_entrypoint.sh"]
CMD ["pumba", "--help"]

ARG GH_SHA=dev
LABEL org.label-schema.vcs-ref=$GH_SHA \
org.label-schema.vcs-url="https://github.com/gaia-adm/pumba"
org.label-schema.vcs-url="https://github.com/alexei-led/pumba"
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#### Build

[![Build Status](https://travis-ci.org/alexei-led/pumba.svg?branch=master)](https://travis-ci.org/alexei-led/pumba) [![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=alexei-led&repoName=pumba&branch=master&pipelineName=pumba&accountName=codefresh-inc&type=cf-1)]( https://g.codefresh.io/repositories/alexei-led/pumba/builds?filter=trigger:build;branch:master;service:5a9d1dac81caf90001f95f9d~pumba) [![Go Report Card](https://goreportcard.com/badge/github.com/gaia-adm/pumba)](https://goreportcard.com/report/github.com/gaia-adm/pumba) [![codecov](https://codecov.io/gh/gaia-adm/pumba/branch/master/graph/badge.svg)](https://codecov.io/gh/gaia-adm/pumba) [![GitHub release](https://img.shields.io/github/release/gaia-adm/pumba.svg?no-cache)](https://github.com/gaia-adm/pumba/releases/tag/0.2.5)
[![Build Status](https://travis-ci.org/alexei-led/pumba.svg?branch=master)](https://travis-ci.org/alexei-led/pumba) [![Codefresh build status]( https://g.codefresh.io/api/badges/build?repoOwner=alexei-led&repoName=pumba&branch=master&pipelineName=pumba&accountName=codefresh-inc&type=cf-1)]( https://g.codefresh.io/repositories/alexei-led/pumba/builds?filter=trigger:build;branch:master;service:5a9d1dac81caf90001f95f9d~pumba) [![Go Report Card](https://goreportcard.com/badge/github.com/alexei-led/pumba)](https://goreportcard.com/report/github.com/alexei-led/pumba) [![codecov](https://codecov.io/gh/alexei-led/pumba/branch/master/graph/badge.svg)](https://codecov.io/gh/alexei-led/pumba) [![GitHub release](https://img.shields.io/github/release/alexei-led/pumba.svg?no-cache)](https://github.com/alexei-led/pumba/releases/tag/0.2.5)

#### Image

Expand All @@ -16,7 +16,7 @@

## Usage

You can download Pumba binary for your OS from [release](https://github.com/gaia-adm/pumba/releases) page.
You can download Pumba binary for your OS from [release](https://github.com/alexei-led/pumba/releases) page.

```text
$ pumba help
Expand Down Expand Up @@ -342,10 +342,10 @@ Here is the approximate list of commands you will need to run:
```sh
# create required folder
cd $GOPATH
mkdir github.com/gaia-adm && cd github.com/gaia-adm
mkdir github.com/alexei-led && cd github.com/alexei-led

# clone pumba
git clone [email protected]:gaia-adm/pumba.git
git clone [email protected]:alexei-led/pumba.git
cd pumba

# build pumba binary
Expand All @@ -365,7 +365,7 @@ You do not have to install and configure Go in order to build and test Pumba pro
First of all clone Pumba git repository:

```sh
git clone [email protected]:gaia-adm/pumba.git
git clone [email protected]:alexei-led/pumba.git
cd pumba
```

Expand Down
2 changes: 1 addition & 1 deletion action/chaos.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

log "github.com/Sirupsen/logrus"
"github.com/gaia-adm/pumba/container"
"github.com/alexei-led/pumba/container"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion action/chaos_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"
"time"

"github.com/gaia-adm/pumba/container"
"github.com/alexei-led/pumba/container"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
2 changes: 1 addition & 1 deletion deploy/pumba_coreos.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=Pumba for CoreOS
Documentation=https://github.com/gaia-adm/pumba
Documentation=https://github.com/alexei-led/pumba

After=docker.service
Requires=docker.service
Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.com/gaia-adm/pumba
package: github.com/alexei-led/pumba
import:
- package: github.com/Sirupsen/logrus
- package: github.com/stretchr/testify
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"syscall"
"time"

"github.com/gaia-adm/pumba/action"
"github.com/gaia-adm/pumba/container"
"github.com/alexei-led/pumba/action"
"github.com/alexei-led/pumba/container"

log "github.com/Sirupsen/logrus"

Expand Down
4 changes: 2 additions & 2 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"
"time"

"github.com/gaia-adm/pumba/action"
"github.com/gaia-adm/pumba/container"
"github.com/alexei-led/pumba/action"
"github.com/alexei-led/pumba/container"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/suite"
Expand Down

0 comments on commit 537d77d

Please sign in to comment.