Skip to content
Merged
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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ assignees: ''
## Steps to Reproduce (for bugs)
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
<!--- and make sure you have followed https://github.com/bindoffice/bind-store/tree/release/docs/debugging to capture relevant logs -->
<!--- and make sure you have followed https://github.com/bindoffice/bindstore/tree/release/docs/debugging to capture relevant logs -->

1.
2.
Expand All @@ -41,6 +41,6 @@ assignees: ''

## Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Version used (`bind-store --version`):
* Version used (`bindstore --version`):
* Server setup and configuration:
* Operating System and version (`uname -a`):
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ assignees: ''
## Steps to Reproduce (for bugs)
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
<!--- and make sure you have followed https://github.com/bindoffice/bind-store/tree/release/docs/debugging to capture relevant logs -->
<!--- and make sure you have followed https://github.com/bindoffice/bindstore/tree/release/docs/debugging to capture relevant logs -->

1.
2.
Expand All @@ -41,6 +41,6 @@ assignees: ''

## Your Environment
<!--- Include as many relevant details about the environment you experienced the bug in -->
* Version used (`bind-store --version`):
* Version used (`bindstore --version`):
* Server setup and configuration:
* Operating System and version (`uname -a`):
2 changes: 1 addition & 1 deletion .github/workflows/go-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ jobs:
CGO_ENABLED: 0
GO111MODULE: on
run: |
go build -ldflags="-s -w" -o "$env:GOPATH\bin\bind-store.exe" .
go build -ldflags="-s -w" -o "$env:GOPATH\bin\bindstore.exe" .
go test -v -timeout 50m ./...
44 changes: 22 additions & 22 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
project_name: bind-store
project_name: bindstore

release:
name_template: "Version {{.Version}}"
disable: true
github:
owner: bindoffice
name: bind-store
name: bindstore

env:
- CGO_ENABLED=0
Expand Down Expand Up @@ -67,7 +67,7 @@ builds:
- -trimpath

ldflags:
- "-s -w -X github.com/bindoffice/bind-store/cmd.Version={{.Version}} -X github.com/bindoffice/bind-store/cmd.ReleaseTag={{.Tag}} -X github.com/bindoffice/bind-store/cmd.CommitID={{.FullCommit}} -X github.com/bindoffice/bind-store/cmd.ShortCommitID={{.ShortCommit}}"
- "-s -w -X github.com/bindoffice/bindstore/cmd.Version={{.Version}} -X github.com/bindoffice/bindstore/cmd.ReleaseTag={{.Tag}} -X github.com/bindoffice/bindstore/cmd.CommitID={{.FullCommit}} -X github.com/bindoffice/bindstore/cmd.ShortCommitID={{.ShortCommit}}"

archives:
-
Expand All @@ -76,12 +76,12 @@ archives:

nfpms:
-
id: bind-store
package_name: bind-store
id: bindstore
package_name: bindstore
vendor: BindOffice
homepage: https://github.com/bindoffice/bind-store
homepage: https://github.com/bindoffice/bindstore
maintainer: dev@bindoffice.com
description: bind-store is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service.
description: bindstore is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service.
license: Apache 2.0
bindir: /usr/bin
formats:
Expand All @@ -93,21 +93,21 @@ nfpms:
replacements:
arm: armv7
files:
"NOTICE": "/usr/share/bind-store/NOTICE"
"CREDITS": "/usr/share/bind-store/CREDITS"
"LICENSE": "/usr/share/bind-store/LICENSE"
"README.md": "/usr/share/bind-store/README.md"
"NOTICE": "/usr/share/bindstore/NOTICE"
"CREDITS": "/usr/share/bindstore/CREDITS"
"LICENSE": "/usr/share/bindstore/LICENSE"
"README.md": "/usr/share/bindstore/README.md"
rpm:
file_name_template: "{{ .Binary }}-release/rpms/{{ .ProjectName }}-{{ .Version }}.{{ .Arch }}"
replacements:
amd64: x86_64
arm64: aarch64
arm: armv7
files:
"NOTICE": "/usr/share/bind-store/NOTICE"
"CREDITS": "/usr/share/bind-store/CREDITS"
"LICENSE": "/usr/share/bind-store/LICENSE"
"README.md": "/usr/share/bind-store/README.md"
"NOTICE": "/usr/share/bindstore/NOTICE"
"CREDITS": "/usr/share/bindstore/CREDITS"
"LICENSE": "/usr/share/bindstore/LICENSE"
"README.md": "/usr/share/bindstore/README.md"

checksum:
algorithm: sha256
Expand All @@ -118,7 +118,7 @@ signs:
cmd: "sh"
args:
- '-c'
- 'minisign -s /media/${USER}/bind-store/minisign.key -qQSm ${artifact} < /media/${USER}/bind-store/minisign-passphrase'
- 'minisign -s /media/${USER}/bindstore/minisign.key -qQSm ${artifact} < /media/${USER}/bindstore/minisign-passphrase'
artifacts: all

changelog:
Expand All @@ -133,35 +133,35 @@ dockers:
goarch: amd64
dockerfile: Dockerfile.release
image_templates:
- bindoffice/bind-store:{{ .Tag }}
- bindoffice/bind-store:latest
- bindoffice/bindstore:{{ .Tag }}
- bindoffice/bindstore:latest

-
goos: linux
goarch: ppc64le
dockerfile: Dockerfile.ppc64le.release
image_templates:
- bindoffice/bind-store:{{ .Tag }}-ppc64le
- bindoffice/bindstore:{{ .Tag }}-ppc64le

-
goos: linux
goarch: s390x
dockerfile: Dockerfile.s390x.release
image_templates:
- bindoffice/bind-store:{{ .Tag }}-s390x
- bindoffice/bindstore:{{ .Tag }}-s390x

-
goos: linux
goarch: arm64
goarm: ''
dockerfile: Dockerfile.arm64.release
image_templates:
- bindoffice/bind-store:{{ .Tag }}-arm64
- bindoffice/bindstore:{{ .Tag }}-arm64

-
goos: linux
goarch: arm
goarm: '7'
dockerfile: Dockerfile.arm.release
image_templates:
- bindoffice/bind-store:{{ .Tag }}-arm
- bindoffice/bindstore:{{ .Tag }}-arm
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
Start by forking the MinIO GitHub repository, make changes in a branch and then send a pull request. We encourage pull requests to discuss code changes. Here are the steps in details:

### Setup your MinIO GitHub Repository
Fork [MinIO upstream](https://github.com/bindoffice/bind-store/fork) source repository to your own personal repository. Copy the URL of your MinIO fork (you will need it for the `git clone` command below).
Fork [MinIO upstream](https://github.com/bindoffice/bindstore/fork) source repository to your own personal repository. Copy the URL of your MinIO fork (you will need it for the `git clone` command below).

```sh
$ git clone https://github.com/bindoffice/bind-store
$ git clone https://github.com/bindoffice/bindstore
$ go install -v
$ ls $(go env GOPATH)/bin/bind-store
$ ls $(go env GOPATH)/bin/bindstore
```

### Set up git remote as ``upstream``
```sh
$ cd bind-store
$ git remote add upstream https://github.com/bindoffice/bind-store
$ cd bindstore
$ git remote add upstream https://github.com/bindoffice/bindstore
$ git fetch upstream
$ git merge upstream/master
...
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV GO111MODULE on

RUN \
apk add --no-cache git && \
git clone https://github.com/bindoffice/bind-store bind-store && cd bind-store && \
git clone https://github.com/bindoffice/bindstore bindstore && cd bindstore && \
git checkout master && go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)"

FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
Expand All @@ -23,10 +23,10 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \

EXPOSE 9000

COPY --from=builder /go/bin/bind-store /usr/bin/bind-store
COPY --from=builder /go/bind-store/CREDITS /licenses/CREDITS
COPY --from=builder /go/bind-store/LICENSE /licenses/LICENSE
COPY --from=builder /go/bind-store/dockerscripts/docker-entrypoint.sh /usr/bin/
COPY --from=builder /go/bin/bindstore /usr/bin/bindstore
COPY --from=builder /go/bindstore/CREDITS /licenses/CREDITS
COPY --from=builder /go/bindstore/LICENSE /licenses/LICENSE
COPY --from=builder /go/bindstore/dockerscripts/docker-entrypoint.sh /usr/bin/

RUN \
microdnf update --nodocs && \
Expand All @@ -38,4 +38,4 @@ ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]

VOLUME ["/data"]

CMD ["bind-store"]
CMD ["bindstore"]
12 changes: 6 additions & 6 deletions Dockerfile.cicd
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV GO111MODULE on

RUN \
apk add --no-cache git && \
git clone https://github.com/bindoffice/bind-store bind-store && cd bind-store && \
git clone https://github.com/bindoffice/bindstore bindstore && cd bindstore && \
git checkout master && go install -v -ldflags "$(go run buildscripts/gen-ldflags.go)"

FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3
Expand All @@ -25,10 +25,10 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \

EXPOSE 9000

COPY --from=builder /go/bin/bind-store /usr/bin/bind-store
COPY --from=builder /go/bind-store/CREDITS /licenses/CREDITS
COPY --from=builder /go/bind-store/LICENSE /licenses/LICENSE
COPY --from=builder /go/bind-store/dockerscripts/docker-entrypoint.sh /usr/bin/
COPY --from=builder /go/bin/bindstore /usr/bin/bindstore
COPY --from=builder /go/bindstore/CREDITS /licenses/CREDITS
COPY --from=builder /go/bindstore/LICENSE /licenses/LICENSE
COPY --from=builder /go/bindstore/dockerscripts/docker-entrypoint.sh /usr/bin/

RUN \
microdnf update --nodocs && \
Expand All @@ -39,4 +39,4 @@ ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]

VOLUME ["/data"]

CMD ["bind-store", "server", "/data"]
CMD ["bindstore", "server", "/data"]
6 changes: 3 additions & 3 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG TARGETARCH
LABEL maintainer="MinIO Inc <dev@min.io>"

COPY dockerscripts/docker-entrypoint.sh /usr/bin/
COPY bind-store /usr/bin/bind-store
COPY bindstore /usr/bin/bindstore

ENV MINIO_UPDATE=off \
MINIO_ACCESS_KEY_FILE=access_key \
Expand All @@ -18,7 +18,7 @@ ENV MINIO_UPDATE=off \
RUN microdnf update --nodocs
RUN microdnf install curl ca-certificates shadow-utils util-linux --nodocs
RUN microdnf clean all && \
chmod +x /usr/bin/bind-store && \
chmod +x /usr/bin/bindstore && \
chmod +x /usr/bin/docker-entrypoint.sh

EXPOSE 9000
Expand All @@ -27,4 +27,4 @@ ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]

VOLUME ["/data"]

CMD ["bind-store"]
CMD ["bindstore"]
16 changes: 8 additions & 8 deletions Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ENV MINIO_ACCESS_KEY_FILE=access_key \
MINIO_SSE_MASTER_KEY_FILE=sse_master_key \
MINIO_UPDATE_MINISIGN_PUBKEY="RWTx5Zr1tiHQLwG9keckT0c45M3AGeHD6IvimQHpyRywVWGbP1aVSGav"

COPY dockerscripts/verify-bind-store.sh /usr/bin/verify-bind-store.sh
COPY dockerscripts/verify-bindstore.sh /usr/bin/verify-bindstore.sh
COPY dockerscripts/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
COPY CREDITS /licenses/CREDITS
COPY LICENSE /licenses/LICENSE
Expand All @@ -30,19 +30,19 @@ RUN \
microdnf install curl ca-certificates shadow-utils util-linux --nodocs && \
rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
microdnf install minisign --nodocs && \
curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE} -o /usr/bin/bind-store && \
curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE}.sha256sum -o /usr/bin/bind-store.sha256sum && \
curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE}.minisig -o /usr/bin/bind-store.minisig && \
curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE} -o /usr/bin/bindstore && \
curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE}.sha256sum -o /usr/bin/bindstore.sha256sum && \
curl -s -q https://dl.min.io/server/minio/release/linux-${TARGETARCH}/archive/minio.${RELEASE}.minisig -o /usr/bin/bindstore.minisig && \
microdnf clean all && \
chmod +x /usr/bin/bind-store && \
chmod +x /usr/bin/bindstore && \
chmod +x /usr/bin/docker-entrypoint.sh && \
chmod +x /usr/bin/verify-bind-store.sh && \
/usr/bin/verify-bind-store.sh
chmod +x /usr/bin/verify-bindstore.sh && \
/usr/bin/verify-bindstore.sh

EXPOSE 9000

ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]

VOLUME ["/data"]

CMD ["bind-store"]
CMD ["bindstore"]
34 changes: 17 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GOLANGCI_VERSION ?= v2.4.0
GOLANGCI_LINT := $(GOPATH)/bin/golangci-lint

VERSION ?= $(shell git describe --tags)
TAG ?= "bindoffice/bind-store:$(VERSION)"
TAG ?= "bindoffice/bindstore:$(VERSION)"

all: build

Expand Down Expand Up @@ -41,7 +41,7 @@ lint:
@GO111MODULE=on $(GOLANGCI_LINT) cache clean
@GO111MODULE=on $(GOLANGCI_LINT) run --config ./.golangci.yml

# Builds bind-store, runs the verifiers then runs the tests.
# Builds bindstore, runs the verifiers then runs the tests.
check: test
test: verifiers build
@echo "Running unit tests"
Expand All @@ -51,48 +51,48 @@ test-race: verifiers build
@echo "Running unit tests under -race"
@(env bash $(PWD)/buildscripts/race.sh)

# Verify bind-store binary
# Verify bindstore binary
verify:
@echo "Verifying build with race"
@GO111MODULE=on CGO_ENABLED=1 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/bind-store 1>/dev/null
@GO111MODULE=on CGO_ENABLED=1 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/bindstore 1>/dev/null
@(env bash $(PWD)/buildscripts/verify-build.sh)

# Verify healing of disks with bind-store binary
# Verify healing of disks with bindstore binary
verify-healing:
@echo "Verify healing build with race"
@GO111MODULE=on CGO_ENABLED=1 go build -race -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/bind-store 1>/dev/null
@GO111MODULE=on CGO_ENABLED=1 go build -race -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/bindstore 1>/dev/null
@(env bash $(PWD)/buildscripts/verify-healing.sh)

# Builds bind-store locally.
# Builds bindstore locally.
build: checks
@echo "Building bind-store binary to './bind-store'"
@GO111MODULE=on CGO_ENABLED=0 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/bind-store 1>/dev/null
@echo "Building bindstore binary to './bindstore'"
@GO111MODULE=on CGO_ENABLED=0 go build -tags kqueue -trimpath --ldflags "$(LDFLAGS)" -o $(PWD)/bindstore 1>/dev/null

hotfix-vars:
$(eval LDFLAGS := $(shell MINIO_RELEASE="RELEASE" MINIO_HOTFIX="hotfix.$(shell git rev-parse --short HEAD)" go run buildscripts/gen-ldflags.go $(shell git describe --tags --abbrev=0 | \
sed 's#RELEASE\.\([0-9]\+\)-\([0-9]\+\)-\([0-9]\+\)T\([0-9]\+\)-\([0-9]\+\)-\([0-9]\+\)Z#\1-\2-\3T\4:\5:\6Z#')))
$(eval TAG := "bindoffice/bind-store:$(shell git describe --tags --abbrev=0).hotfix.$(shell git rev-parse --short HEAD)")
$(eval TAG := "bindoffice/bindstore:$(shell git describe --tags --abbrev=0).hotfix.$(shell git rev-parse --short HEAD)")
hotfix: hotfix-vars install

docker-hotfix: hotfix checks
@echo "Building bind-store docker image '$(TAG)'"
@echo "Building bindstore docker image '$(TAG)'"
@docker build -t $(TAG) . -f Dockerfile.dev

docker: build checks
@echo "Building bind-store docker image '$(TAG)'"
@echo "Building bindstore docker image '$(TAG)'"
@docker build -t $(TAG) . -f Dockerfile.dev

# Builds bind-store and installs it to $GOPATH/bin.
# Builds bindstore and installs it to $GOPATH/bin.
install: build
@echo "Installing bind-store binary to '$(GOPATH)/bin/bind-store'"
@mkdir -p $(GOPATH)/bin && cp -f $(PWD)/bind-store $(GOPATH)/bin/bind-store
@echo "Installation successful. To learn more, try \"bind-store --help\"."
@echo "Installing bindstore binary to '$(GOPATH)/bin/bindstore'"
@mkdir -p $(GOPATH)/bin && cp -f $(PWD)/bindstore $(GOPATH)/bin/bindstore
@echo "Installation successful. To learn more, try \"bindstore --help\"."

clean:
@echo "Cleaning up all the generated files"
@find . -name '*.test' | xargs rm -fv
@find . -name '*~' | xargs rm -fv
@rm -rvf bind-store
@rm -rvf bindstore
@rm -rvf build
@rm -rvf release
@rm -rvf .verify*
Loading
Loading