Skip to content

Commit

Permalink
Move from hyperledgendary to hyperledger-labs
Browse files Browse the repository at this point in the history
Update things for the new hyperledger-labs organisation

Signed-off-by: James Taylor <[email protected]>
  • Loading branch information
jt-nti committed Jul 26, 2022
1 parent bdd4aae commit e4f5caf
Show file tree
Hide file tree
Showing 20 changed files with 38 additions and 38 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ jobs:
- name: Build Docker image
run: |
docker build . --file Dockerfile --label "org.opencontainers.image.revision=${GITHUB_SHA}" --tag k8s-fabric-peer
docker tag k8s-fabric-peer ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_SHA}
docker tag k8s-fabric-peer ghcr.io/hyperledger-labs/k8s-fabric-peer:${GITHUB_SHA}
if [ "${GITHUB_REF:0:10}" = "refs/tags/" ]; then
docker tag k8s-fabric-peer ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_REF_NAME}
docker tag k8s-fabric-peer ghcr.io/hyperledgendary/k8s-fabric-peer:latest
docker tag k8s-fabric-peer ghcr.io/hyperledger-labs/k8s-fabric-peer:${GITHUB_REF_NAME}
docker tag k8s-fabric-peer ghcr.io/hyperledger-labs/k8s-fabric-peer:latest
fi
- name: Publish Docker image
if: github.event_name != 'pull_request'
run: |
echo ${DOCKER_PW} | docker login ghcr.io -u ${DOCKER_USER} --password-stdin
docker push ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_SHA}
docker push ghcr.io/hyperledger-labs/k8s-fabric-peer:${GITHUB_SHA}
if [ "${GITHUB_REF:0:10}" = "refs/tags/" ]; then
docker push ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_REF_NAME}
docker push ghcr.io/hyperledgendary/k8s-fabric-peer:latest
docker push ghcr.io/hyperledger-labs/k8s-fabric-peer:${GITHUB_REF_NAME}
docker push ghcr.io/hyperledger-labs/k8s-fabric-peer:latest
fi
env:
DOCKER_USER: ${{ github.actor }}
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ RUN apk add --no-cache \
make \
musl-dev

ADD . $GOPATH/src/github.com/hyperledgendary/fabric-builder-k8s
WORKDIR $GOPATH/src/github.com/hyperledgendary/fabric-builder-k8s
ADD . $GOPATH/src/github.com/hyperledger-labs/fabric-builder-k8s
WORKDIR $GOPATH/src/github.com/hyperledger-labs/fabric-builder-k8s

RUN go install ./cmd/...

Expand All @@ -29,7 +29,7 @@ FROM hyperledger/fabric-peer:${HLF_VERSION}

LABEL org.opencontainers.image.title "K8s Hyperledger Fabric Peer"
LABEL org.opencontainers.image.description "Hyperledger Fabric Peer with a preconfigured Kubernetes chaincode builder"
LABEL org.opencontainers.image.source "https://github.com/hyperledgendary/fabric-builder-k8s"
LABEL org.opencontainers.image.source "https://github.com/hyperledger-labs/fabric-builder-k8s"

COPY --from=core core.yaml ${FABRIC_CFG_PATH}
COPY --from=build /go/bin/ /opt/hyperledger/k8s_builder/bin/
2 changes: 1 addition & 1 deletion cmd/build/build_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestBuild(t *testing.T) {

var _ = BeforeSuite(func() {
var err error
buildCmdPath, err = gexec.Build("github.com/hyperledgendary/fabric-builder-k8s/cmd/build")
buildCmdPath, err = gexec.Build("github.com/hyperledger-labs/fabric-builder-k8s/cmd/build")
Expect(err).NotTo(HaveOccurred())
})

Expand Down
6 changes: 3 additions & 3 deletions cmd/build/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"context"
"os"

"github.com/hyperledgendary/fabric-builder-k8s/internal/builder"
"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledgendary/fabric-builder-k8s/internal/util"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/detect/detect_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestDetect(t *testing.T) {

var _ = BeforeSuite(func() {
var err error
detectCmdPath, err = gexec.Build("github.com/hyperledgendary/fabric-builder-k8s/cmd/detect")
detectCmdPath, err = gexec.Build("github.com/hyperledger-labs/fabric-builder-k8s/cmd/detect")
Expect(err).NotTo(HaveOccurred())
})

Expand Down
6 changes: 3 additions & 3 deletions cmd/detect/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"context"
"os"

"github.com/hyperledgendary/fabric-builder-k8s/internal/builder"
"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledgendary/fabric-builder-k8s/internal/util"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions cmd/release/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"context"
"os"

"github.com/hyperledgendary/fabric-builder-k8s/internal/builder"
"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledgendary/fabric-builder-k8s/internal/util"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/release/release_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func TestRelease(t *testing.T) {

var _ = BeforeSuite(func() {
var err error
releaseCmdPath, err = gexec.Build("github.com/hyperledgendary/fabric-builder-k8s/cmd/release")
releaseCmdPath, err = gexec.Build("github.com/hyperledger-labs/fabric-builder-k8s/cmd/release")
Expect(err).NotTo(HaveOccurred())
})

Expand Down
6 changes: 3 additions & 3 deletions cmd/run/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"context"
"os"

"github.com/hyperledgendary/fabric-builder-k8s/internal/builder"
"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledgendary/fabric-builder-k8s/internal/util"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/builder"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion docs/FABRIC_OPERATOR.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The [Fabric Operator](https://github.com/hyperledger-labs/fabric-operator) inclu
Before following [the Fabric Operator sample network instructions](https://github.com/hyperledger-labs/fabric-operator/tree/main/sample-network), export the following environment variables to use the k8s builder peer image:

```shell
export TEST_NETWORK_PEER_IMAGE=ghcr.io/hyperledgendary/k8s-fabric-peer
export TEST_NETWORK_PEER_IMAGE=ghcr.io/hyperledger-labs/k8s-fabric-peer
export TEST_NETWORK_PEER_IMAGE_LABEL=v0.6.0
```

Expand Down
2 changes: 1 addition & 1 deletion docs/HLF_OPERATOR.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Follow the [Hyperledger Fabric Operator getting started instructions](https://la
Configure the hfl-operator to use the k8s builder peer image:

```shell
export PEER_IMAGE=ghcr.io/hyperledgendary/k8s-fabric-peer
export PEER_IMAGE=ghcr.io/hyperledger-labs/k8s-fabric-peer
export PEER_VERSION=v0.6.0
```

Expand Down
2 changes: 1 addition & 1 deletion docs/TEST_NETWORK_NANO.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The k8s builder can be used with the [nano test network](https://github.com/hype

## Download builder binaries

Download the latest builder binaries from the [releases page](https://github.com/hyperledgendary/fabric-builder-k8s/releases) and extract them to a `k8s_builder/bin` directory in your home directory.
Download the latest builder binaries from the [releases page](https://github.com/hyperledger-labs/fabric-builder-k8s/releases) and extract them to a `k8s_builder/bin` directory in your home directory.

## Configure builder

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/hyperledgendary/fabric-builder-k8s
module github.com/hyperledger-labs/fabric-builder-k8s

go 1.17

Expand Down
4 changes: 2 additions & 2 deletions internal/builder/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package builder
import (
"context"

"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledgendary/fabric-builder-k8s/internal/util"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
)

type Build struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/builder/detect.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"path/filepath"
"strings"

"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
)

type Detect struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/builder/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package builder
import (
"context"

"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledgendary/fabric-builder-k8s/internal/util"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
)

type Release struct {
Expand Down
4 changes: 2 additions & 2 deletions internal/builder/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"context"
"fmt"

"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledgendary/fabric-builder-k8s/internal/util"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/util"
)

type Run struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/util/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"

"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
"github.com/otiai10/copy"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/util/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"path/filepath"

"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
)

// ChaincodeJSON represents the chaincode.json file that is supplied by Fabric in
Expand Down
2 changes: 1 addition & 1 deletion internal/util/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"time"

"github.com/hyperledgendary/fabric-builder-k8s/internal/log"
"github.com/hyperledger-labs/fabric-builder-k8s/internal/log"
apiv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down

0 comments on commit e4f5caf

Please sign in to comment.