Skip to content

Commit 46894d6

Browse files
committed
Merge branch 'release/0.17.0'
2 parents 63454af + b086c7f commit 46894d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+108
-103
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go:
44
- 1.9.2
55
services:
66
- docker
7-
go_import_path: github.com/pauldotknopf/darch
7+
go_import_path: github.com/godarch/darch
88
before_install:
99
- echo "deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
1010
- sudo apt-get -qq update

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ install: bundle
9393
release:
9494
ifdef TRAVIS_TAG
9595
@echo "creating github release"
96-
@github-release release --user pauldotknopf --repo darch --tag $(TAG)
96+
@github-release release --user godarch --repo darch --tag $(TAG)
9797
@echo "uploading $(DESTINATION_BUNDLE_FILE_NAME)"
98-
@github-release upload --user pauldotknopf --repo darch --tag $(TAG) --name $(DESTINATION_BUNDLE_FILE_NAME) --file output/$(DESTINATION_BUNDLE_FILE_NAME)
98+
@github-release upload --user godarch --repo darch --tag $(TAG) --name $(DESTINATION_BUNDLE_FILE_NAME) --file output/$(DESTINATION_BUNDLE_FILE_NAME)
9999
ifeq ($(BUNDLE_RUNTIME), yes)
100100
@echo "uploading $(DESTINATION_BUNDLE_FILE_NAME_WITH_RUNTIME)"
101-
@github-release upload --user pauldotknopf --repo darch --tag $(TAG) --name $(DESTINATION_BUNDLE_FILE_NAME_WITH_RUNTIME) --file output/$(DESTINATION_BUNDLE_FILE_NAME_WITH_RUNTIME)
101+
@github-release upload --user godarch --repo darch --tag $(TAG) --name $(DESTINATION_BUNDLE_FILE_NAME_WITH_RUNTIME) --file output/$(DESTINATION_BUNDLE_FILE_NAME_WITH_RUNTIME)
102102
endif
103103
@echo "updating aur"
104104
scripts/aur/deploy-aur $(VERSION)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Darch
22

3-
[![Build Status](https://travis-ci.org/pauldotknopf/darch.svg?branch=develop)](https://travis-ci.org/pauldotknopf/darch)
3+
[![Build Status](https://travis-ci.org/godarch/darch.svg?branch=develop)](https://travis-ci.org/godarch/darch)
44

55
# Installation

pkg/cmd/darch/commands/helpers/glob-first-match.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strings"
66

77
"github.com/gobwas/glob"
8-
"github.com/pauldotknopf/darch/pkg/utils"
8+
"github.com/godarch/darch/pkg/utils"
99
"github.com/urfave/cli"
1010
)
1111

pkg/cmd/darch/commands/hooks/details.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package hooks
33
import (
44
"fmt"
55

6-
"github.com/pauldotknopf/darch/pkg/hooks"
7-
"github.com/pauldotknopf/darch/pkg/staging"
6+
"github.com/godarch/darch/pkg/hooks"
7+
"github.com/godarch/darch/pkg/staging"
88
"github.com/urfave/cli"
99
)
1010

pkg/cmd/darch/commands/hooks/help.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package hooks
22

33
import (
4-
"github.com/pauldotknopf/darch/pkg/hooks"
4+
"github.com/godarch/darch/pkg/hooks"
55
"github.com/urfave/cli"
66
)
77

pkg/cmd/darch/commands/hooks/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package hooks
33
import (
44
"fmt"
55

6-
"github.com/pauldotknopf/darch/pkg/hooks"
6+
"github.com/godarch/darch/pkg/hooks"
77
"github.com/urfave/cli"
88
)
99

pkg/cmd/darch/commands/images/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/pauldotknopf/darch/pkg/repository"
7+
"github.com/godarch/darch/pkg/repository"
88
"github.com/urfave/cli"
99
)
1010

pkg/cmd/darch/commands/images/pull.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
ctx "context"
55
"fmt"
66

7-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
8-
"github.com/pauldotknopf/darch/pkg/reference"
9-
"github.com/pauldotknopf/darch/pkg/repository"
7+
"github.com/godarch/darch/pkg/cmd/darch/commands"
8+
"github.com/godarch/darch/pkg/reference"
9+
"github.com/godarch/darch/pkg/repository"
1010
"github.com/urfave/cli"
1111
)
1212

pkg/cmd/darch/commands/images/push.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
ctx "context"
55
"fmt"
66

7-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
8-
"github.com/pauldotknopf/darch/pkg/reference"
9-
"github.com/pauldotknopf/darch/pkg/repository"
7+
"github.com/godarch/darch/pkg/cmd/darch/commands"
8+
"github.com/godarch/darch/pkg/reference"
9+
"github.com/godarch/darch/pkg/repository"
1010
"github.com/urfave/cli"
1111
)
1212

pkg/cmd/darch/commands/images/remove.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package images
33
import (
44
"context"
55

6-
"github.com/pauldotknopf/darch/pkg/reference"
7-
"github.com/pauldotknopf/darch/pkg/repository"
6+
"github.com/godarch/darch/pkg/reference"
7+
"github.com/godarch/darch/pkg/repository"
88
"github.com/urfave/cli"
99
)
1010

pkg/cmd/darch/commands/images/tag.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/pauldotknopf/darch/pkg/reference"
8-
"github.com/pauldotknopf/darch/pkg/repository"
7+
"github.com/godarch/darch/pkg/reference"
8+
"github.com/godarch/darch/pkg/repository"
99
"github.com/urfave/cli"
1010
)
1111

pkg/cmd/darch/commands/recipes/build.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package recipes
33
import (
44
"context"
55
"fmt"
6-
"github.com/pauldotknopf/darch/pkg/recipes"
7-
"github.com/pauldotknopf/darch/pkg/repository"
6+
"github.com/godarch/darch/pkg/recipes"
7+
"github.com/godarch/darch/pkg/repository"
88
"github.com/urfave/cli"
99
"strings"
1010
)

pkg/cmd/darch/commands/recipes/builddep.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package recipes
33
import (
44
"fmt"
55

6-
"github.com/pauldotknopf/darch/pkg/recipes"
7-
"github.com/pauldotknopf/darch/pkg/utils"
6+
"github.com/godarch/darch/pkg/recipes"
7+
"github.com/godarch/darch/pkg/utils"
88
"github.com/urfave/cli"
99
)
1010

pkg/cmd/darch/commands/recipes/children.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"log"
66
"sort"
77

8-
"github.com/pauldotknopf/darch/pkg/recipes"
8+
"github.com/godarch/darch/pkg/recipes"
99
"github.com/urfave/cli"
1010
)
1111

pkg/cmd/darch/commands/recipes/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package recipes
33
import (
44
"fmt"
55

6-
"github.com/pauldotknopf/darch/pkg/recipes"
6+
"github.com/godarch/darch/pkg/recipes"
77
"github.com/urfave/cli"
88
)
99

pkg/cmd/darch/commands/recipes/parents.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"fmt"
55
"log"
66

7-
"github.com/pauldotknopf/darch/pkg/recipes"
8-
"github.com/pauldotknopf/darch/pkg/utils"
7+
"github.com/godarch/darch/pkg/recipes"
8+
"github.com/godarch/darch/pkg/utils"
99
"github.com/urfave/cli"
1010
)
1111

pkg/cmd/darch/commands/recipes/tree.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package recipes
22

33
import (
44
"github.com/disiqueira/gotree"
5-
"github.com/pauldotknopf/darch/pkg/recipes"
6-
"github.com/pauldotknopf/darch/pkg/utils"
5+
"github.com/godarch/darch/pkg/recipes"
6+
"github.com/godarch/darch/pkg/utils"
77
"github.com/urfave/cli"
88
)
99

pkg/cmd/darch/commands/stage/grub/grub-config-entry.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package grub
22

33
import (
44
"fmt"
5-
"github.com/pauldotknopf/darch/pkg/block"
6-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
7-
"github.com/pauldotknopf/darch/pkg/grub"
5+
"github.com/godarch/darch/pkg/block"
6+
"github.com/godarch/darch/pkg/cmd/darch/commands"
7+
"github.com/godarch/darch/pkg/grub"
88
"github.com/urfave/cli"
99
"io"
1010
"os"

pkg/cmd/darch/commands/stage/grub/grub-menu-entries.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package grub
22

33
import (
4-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
5-
"github.com/pauldotknopf/darch/pkg/staging"
4+
"github.com/godarch/darch/pkg/cmd/darch/commands"
5+
"github.com/godarch/darch/pkg/staging"
66
"github.com/urfave/cli"
77
"os"
88
)

pkg/cmd/darch/commands/stage/grub/grub-menu-entry.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package grub
22

33
import (
44
"fmt"
5-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
6-
"github.com/pauldotknopf/darch/pkg/reference"
7-
"github.com/pauldotknopf/darch/pkg/staging"
5+
"github.com/godarch/darch/pkg/cmd/darch/commands"
6+
"github.com/godarch/darch/pkg/reference"
7+
"github.com/godarch/darch/pkg/staging"
88
"github.com/urfave/cli"
99
"os"
1010
)

pkg/cmd/darch/commands/stage/list.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package stage
33
import (
44
"fmt"
55

6-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
7-
"github.com/pauldotknopf/darch/pkg/staging"
6+
"github.com/godarch/darch/pkg/cmd/darch/commands"
7+
"github.com/godarch/darch/pkg/staging"
88
"github.com/urfave/cli"
99
)
1010

pkg/cmd/darch/commands/stage/remove.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package stage
22

33
import (
4-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
5-
"github.com/pauldotknopf/darch/pkg/reference"
6-
"github.com/pauldotknopf/darch/pkg/staging"
4+
"github.com/godarch/darch/pkg/cmd/darch/commands"
5+
"github.com/godarch/darch/pkg/reference"
6+
"github.com/godarch/darch/pkg/staging"
77
"github.com/urfave/cli"
88
)
99

pkg/cmd/darch/commands/stage/run-hooks.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package stage
22

33
import (
4-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
5-
"github.com/pauldotknopf/darch/pkg/reference"
6-
"github.com/pauldotknopf/darch/pkg/staging"
4+
"github.com/godarch/darch/pkg/cmd/darch/commands"
5+
"github.com/godarch/darch/pkg/reference"
6+
"github.com/godarch/darch/pkg/staging"
77
"github.com/urfave/cli"
88
)
99

pkg/cmd/darch/commands/stage/stage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package stage
22

33
import (
4-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands/stage/grub"
4+
"github.com/godarch/darch/pkg/cmd/darch/commands/stage/grub"
55
"github.com/urfave/cli"
66
)
77

pkg/cmd/darch/commands/stage/sync-bootloader.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package stage
22

33
import (
4-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
5-
"github.com/pauldotknopf/darch/pkg/staging"
4+
"github.com/godarch/darch/pkg/cmd/darch/commands"
5+
"github.com/godarch/darch/pkg/staging"
66
"github.com/urfave/cli"
77
)
88

pkg/cmd/darch/commands/stage/tag.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package stage
22

33
import (
4-
"github.com/pauldotknopf/darch/pkg/reference"
5-
"github.com/pauldotknopf/darch/pkg/staging"
4+
"github.com/godarch/darch/pkg/reference"
5+
"github.com/godarch/darch/pkg/staging"
66
"github.com/urfave/cli"
77
)
88

pkg/cmd/darch/commands/stage/upload.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package stage
33
import (
44
"context"
55

6-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands"
7-
"github.com/pauldotknopf/darch/pkg/reference"
8-
"github.com/pauldotknopf/darch/pkg/repository"
9-
"github.com/pauldotknopf/darch/pkg/staging"
10-
"github.com/pauldotknopf/darch/pkg/workspace"
6+
"github.com/godarch/darch/pkg/cmd/darch/commands"
7+
"github.com/godarch/darch/pkg/reference"
8+
"github.com/godarch/darch/pkg/repository"
9+
"github.com/godarch/darch/pkg/staging"
10+
"github.com/godarch/darch/pkg/workspace"
1111
"github.com/urfave/cli"
1212
)
1313

pkg/cmd/darch/main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands/helpers"
8-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands/hooks"
9-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands/images"
10-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands/recipes"
11-
"github.com/pauldotknopf/darch/pkg/cmd/darch/commands/stage"
7+
"github.com/godarch/darch/pkg/cmd/darch/commands/helpers"
8+
"github.com/godarch/darch/pkg/cmd/darch/commands/hooks"
9+
"github.com/godarch/darch/pkg/cmd/darch/commands/images"
10+
"github.com/godarch/darch/pkg/cmd/darch/commands/recipes"
11+
"github.com/godarch/darch/pkg/cmd/darch/commands/stage"
1212

1313
"github.com/urfave/cli"
1414
)

pkg/hooks/hooks.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"sort"
1111

1212
"github.com/gobwas/glob"
13-
"github.com/pauldotknopf/darch/pkg/reference"
14-
"github.com/pauldotknopf/darch/pkg/utils"
13+
"github.com/godarch/darch/pkg/reference"
14+
"github.com/godarch/darch/pkg/utils"
1515
)
1616

1717
var (

pkg/recipes/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"path"
88
"strings"
99

10-
"github.com/pauldotknopf/darch/pkg/utils"
10+
"github.com/godarch/darch/pkg/utils"
1111
)
1212

1313
type recipeConfiguration struct {

pkg/recipes/recipes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package recipes
33
import (
44
"fmt"
55

6-
"github.com/pauldotknopf/darch/pkg/utils"
6+
"github.com/godarch/darch/pkg/utils"
77
)
88

99
// Recipe A struct representing a recipe to be built.

pkg/reference/store.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"path/filepath"
99

1010
"github.com/docker/docker/pkg/ioutils"
11-
"github.com/pauldotknopf/darch/pkg/utils"
11+
"github.com/godarch/darch/pkg/utils"
1212
)
1313

1414
var (

pkg/reference/store_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"path"
66
"testing"
77

8-
"github.com/pauldotknopf/darch/pkg/utils"
8+
"github.com/godarch/darch/pkg/utils"
99
)
1010

1111
func TestCreatesOnNew(t *testing.T) {

pkg/repository/build.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313
"github.com/containerd/containerd/images"
1414
"github.com/containerd/containerd/namespaces"
1515
"github.com/containerd/containerd/oci"
16+
"github.com/godarch/darch/pkg/recipes"
17+
"github.com/godarch/darch/pkg/reference"
18+
"github.com/godarch/darch/pkg/repository/manifest"
19+
"github.com/godarch/darch/pkg/utils"
20+
"github.com/godarch/darch/pkg/workspace"
1621
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
1722
specs "github.com/opencontainers/runtime-spec/specs-go"
18-
"github.com/pauldotknopf/darch/pkg/recipes"
19-
"github.com/pauldotknopf/darch/pkg/reference"
20-
"github.com/pauldotknopf/darch/pkg/repository/manifest"
21-
"github.com/pauldotknopf/darch/pkg/utils"
22-
"github.com/pauldotknopf/darch/pkg/workspace"
2323
)
2424

2525
// BuildRecipe Builds a recipe.

0 commit comments

Comments
 (0)