Skip to content

Commit 50c7535

Browse files
authored
Fix licenses (#5741)
1 parent d604b37 commit 50c7535

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

.github/workflows/publish_docker_images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
org.opencontainers.image.title=Quickwit
5454
maintainer=Quickwit, Inc. <[email protected]>
5555
org.opencontainers.image.vendor=Quickwit, Inc.
56-
org.opencontainers.image.licenses=AGPL-3.0
56+
org.opencontainers.image.licenses=Apache-2.0
5757
5858
- name: Retrieve commit date, hash, and tags
5959
run: |

Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ ENV QW_COMMIT_TAGS=$QW_COMMIT_TAGS
2222

2323
RUN apt-get -y update \
2424
&& apt-get -y install ca-certificates \
25-
clang \
26-
cmake \
27-
libssl-dev \
28-
llvm \
29-
protobuf-compiler \
25+
clang \
26+
cmake \
27+
libssl-dev \
28+
llvm \
29+
protobuf-compiler \
3030
&& rm -rf /var/lib/apt/lists/*
3131

3232
COPY quickwit /quickwit
@@ -39,11 +39,11 @@ RUN rustup toolchain install
3939

4040
RUN echo "Building workspace with feature(s) '$CARGO_FEATURES' and profile '$CARGO_PROFILE'" \
4141
&& RUSTFLAGS="--cfg tokio_unstable" \
42-
cargo build \
43-
-p quickwit-cli \
44-
--features $CARGO_FEATURES \
45-
--bin quickwit \
46-
$(test "$CARGO_PROFILE" = "release" && echo "--release") \
42+
cargo build \
43+
-p quickwit-cli \
44+
--features $CARGO_FEATURES \
45+
--bin quickwit \
46+
$(test "$CARGO_PROFILE" = "release" && echo "--release") \
4747
&& echo "Copying binaries to /quickwit/bin" \
4848
&& mkdir -p /quickwit/bin \
4949
&& find target/$CARGO_PROFILE -maxdepth 1 -perm /a+x -type f -exec mv {} /quickwit/bin \;
@@ -54,11 +54,11 @@ FROM debian:bookworm-slim AS quickwit
5454
LABEL org.opencontainers.image.title="Quickwit"
5555
LABEL maintainer="Quickwit, Inc. <[email protected]>"
5656
LABEL org.opencontainers.image.vendor="Quickwit, Inc."
57-
LABEL org.opencontainers.image.licenses="AGPL-3.0"
57+
LABEL org.opencontainers.image.licenses="Apache-2.0"
5858

5959
RUN apt-get -y update \
6060
&& apt-get -y install ca-certificates \
61-
libssl3 \
61+
libssl3 \
6262
&& rm -rf /var/lib/apt/lists/*
6363

6464
WORKDIR /quickwit

distribution/docker/ubuntu/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ FROM ubuntu:noble AS quickwit
99
LABEL org.opencontainers.image.title="Quickwit"
1010
LABEL maintainer="Quickwit, Inc. <[email protected]>"
1111
LABEL org.opencontainers.image.vendor="Quickwit, Inc."
12-
LABEL org.opencontainers.image.licenses="AGPL-3.0"
12+
LABEL org.opencontainers.image.licenses="Apache-2.0"
1313

1414
RUN apt-get -y update \
1515
&& apt-get -y install ca-certificates \
16-
libssl3 \
16+
libssl3 \
1717
&& rm -rf /var/lib/apt/lists/*
1818

1919
WORKDIR /quickwit

docs/get-started/installation.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Support of aarch64 is currently experimental.
3232
<RenderIf condition={useDocsVersion().version == 'current'}>
3333

3434
Version: nightly -
35-
License: [AGPL V3](https://github.com/quickwit-oss/quickwit/blob/main/LICENSE.md) -
35+
License: [Apache 2.0](https://github.com/quickwit-oss/quickwit/blob/main/LICENSE) -
3636
Downloads `.tar.gz`:
3737
- [Linux ARM64](https://github.com/quickwit-oss/quickwit/releases/download/nightly/quickwit-nightly-aarch64-unknown-linux-gnu.tar.gz)
3838
- [Linux x86_64](https://github.com/quickwit-oss/quickwit/releases/download/nightly/quickwit-nightly-x86_64-unknown-linux-gnu.tar.gz)
@@ -45,7 +45,7 @@ Downloads `.tar.gz`:
4545
<RenderIf condition={useDocsVersion().version != 'current'}>
4646

4747
version: 0.8.1 - [Release notes](https://github.com/quickwit-oss/quickwit/releases/tag/v0.8.1) - [Changelog](https://github.com/quickwit-oss/quickwit/blob/main/CHANGELOG.md)
48-
License: [AGPL V3](https://github.com/quickwit-oss/quickwit/blob/main/LICENSE.md)
48+
License: [Apache 2.0](https://github.com/quickwit-oss/quickwit/blob/main/LICENSE)
4949
Downloads `.tar.gz`:
5050
- [Linux ARM64](https://github.com/quickwit-oss/quickwit/releases/download/v0.8.1/quickwit-v0.8.1-aarch64-unknown-linux-gnu.tar.gz)
5151
- [Linux x86_64](https://github.com/quickwit-oss/quickwit/releases/download/v0.8.1/quickwit-v0.8.1-x86_64-unknown-linux-gnu.tar.gz)
@@ -150,13 +150,13 @@ Once installed or extracted, all of Quickwit's installation files can be found i
150150
quickwit-{version}
151151
├── config
152152
│ └── quickwit.yaml
153-
├── LICENSE_AGPLv3.0.txt
153+
├── LICENSE
154154
├── quickwit
155155
└── qwdata
156156
```
157157

158158
- `config/quickwit.yaml`: is the default configuration file.
159-
- `LICENSE_AGPLv3.0.txt`: the license file.
159+
- `LICENSE`: the license file.
160160
- `quickwit`: the quickwit executable binary.
161161
- `qwdata/`: the default data directory.
162162

@@ -176,4 +176,3 @@ docker run --rm --platform linux/amd64 quickwit/quickwit --version
176176
```
177177

178178
To get the full gist of this, follow the [Quickstart guide](./quickstart.md).
179-

0 commit comments

Comments
 (0)