这是indexloc提供的服务,不要输入任何密码
Skip to content
This repository was archived by the owner on Dec 10, 2021. It is now read-only.
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
# Copyright (c) 2017 Minoru Osuka
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

.DS_Store

# Eclipse
.classpath
.project

# Gogland
.idea/

# Blast
bin/
dist/

*.pem
*.csr

cover.out
cover.html
39 changes: 0 additions & 39 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Added

- Add coverage to Makefile #114
- Docker compose #119

### Changed

- Bump Bleve version to v0.8.1 #117


## [v0.8.1]

### Added

### Changed

- Update go version and dependencies #109


## [v0.8.0]

### Added
- Add swagger specification experimentaly #107

### Changed

- New CLI #82
- Split protobuf into components #84
- Change subcommands #85
Expand All @@ -53,59 +40,38 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [v0.7.1] - 2019-07-18

### Added

- Add raft-badger #69
- Add raft-storage-type flag #73
- Add gRPC access logger #74

### Changed

- Improve indexing performance #71
- Remove original document #72
- Rename config package to builtins #75


## [v0.7.0] - 2019-07-03

### Added

- Add GEO search example #65

### Changed

- Migrate grpc-middleware #68


## [v0.6.1] - 2019-06-21

### Added

### Changed

- Fix HTTP response into JSON format #64
- Update Dockerfile #62


## [v0.6.0] - 2019-06-19

### Added

- Add federated search #30
- Add cluster manager (#48)
- Add KVS HTTP handlers #46

### Changed

- Update http logger #51
- Update logutils (#50)
- Remve KVS (#49)


## [v0.5.0] - 2019-03-22

### Added

- Support bulk update #41
- Support Badger #38
- Add index stats #37
Expand All @@ -114,9 +80,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Add logging #33
- Add CHANGES.md #29
- Add error handling for server startup #28.

### Changed

- Fixed some badger bugs #40
- Restructure store package #36
- Update examples #32
Expand All @@ -125,6 +88,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [v0.4.0] - 2019-03-14

### Changed

- Code refactoring.
61 changes: 23 additions & 38 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
# Copyright (c) 2019 Minoru Osuka
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

FROM golang:1.13.0-stretch
FROM golang:1.14.1-stretch

ARG VERSION

Expand All @@ -23,15 +9,15 @@ COPY . ${GOPATH}/src/github.com/mosuka/blast
RUN echo "deb http://ftp.us.debian.org/debian/ jessie main contrib non-free" >> /etc/apt/sources.list && \
echo "deb-src http://ftp.us.debian.org/debian/ jessie main contrib non-free" >> /etc/apt/sources.list && \
apt-get update && \
apt-get upgrade -y && \
apt-get install -y \
git \
golang \
libicu-dev \
libstemmer-dev \
libleveldb-dev \
gcc-4.8 \
g++-4.8 \
build-essential && \
git \
golang \
libicu-dev \
libstemmer-dev \
gcc-4.8 \
g++-4.8 \
build-essential && \
apt-get clean && \
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 80 && \
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 80 && \
Expand All @@ -44,30 +30,29 @@ RUN echo "deb http://ftp.us.debian.org/debian/ jessie main contrib non-free" >>
./compile_libs.sh && \
cp *.so /usr/local/lib && \
cd ${GOPATH}/src/github.com/mosuka/blast && \
make \
GOOS=linux \
GOARCH=amd64 \
CGO_ENABLED=1 \
BUILD_TAGS="kagome icu libstemmer cld2 cznicb leveldb badger" \
VERSION="${VERSION}" \
build
make GOOS=linux \
GOARCH=amd64 \
CGO_ENABLED=1 \
BUILD_TAGS="kagome icu libstemmer cld2" \
VERSION="${VERSION}" \
build

FROM debian:stretch-slim

MAINTAINER Minoru Osuka "minoru.osuka@gmail.com"

RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y \
libicu-dev \
libstemmer-dev \
libleveldb-dev && \
apt-get clean
libicu-dev \
libstemmer-dev && \
apt-get clean && \
rm -rf /var/cache/apk/*

COPY --from=0 /go/src/github.com/blevesearch/cld2/cld2/internal/*.so /usr/local/lib/
COPY --from=0 /go/src/github.com/mosuka/blast/bin/* /usr/bin/
COPY --from=0 /go/src/github.com/mosuka/blast/docker-entrypoint.sh /usr/bin/

EXPOSE 2000 5000 6000 8000
EXPOSE 7000 8000 9000

ENTRYPOINT [ "/usr/bin/docker-entrypoint.sh" ]
CMD [ "blast", "--help" ]
ENTRYPOINT [ "/usr/bin/blast" ]
CMD [ "start" ]
Loading