Skip to content

Commit 02bc960

Browse files
Merge branch 'main' into bkellam/docker-compose-single
2 parents a538453 + 4899c9f commit 02bc960

File tree

284 files changed

+16035
-10067
lines changed

Some content is hidden

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

284 files changed

+16035
-10067
lines changed

.env.development

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
44

55
# Zoekt
66
ZOEKT_WEBSERVER_URL="http://localhost:6070"
7-
# SHARD_MAX_MATCH_COUNT=10000
8-
# TOTAL_MAX_MATCH_COUNT=100000
97
# The command to use for generating ctags.
108
CTAGS_COMMAND=ctags
119
# logging, strict
@@ -82,9 +80,6 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
8280
# Controls the number of concurrent indexing jobs that can run at once
8381
# INDEX_CONCURRENCY_MULTIPLE=
8482

85-
# Controls the polling interval for the web app
86-
# NEXT_PUBLIC_POLLING_INTERVAL_MS=
87-
8883
# Controls the version of the web app
8984
# NEXT_PUBLIC_SOURCEBOT_VERSION=
9085

.github/workflows/deploy-demo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Deploy Demo
22

33
on:
44
push:
5-
branches: ["main"]
5+
tags: ["v*.*.*"]
66
workflow_dispatch:
77

88
jobs:

.github/workflows/ghcr-publish.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
platform: [linux/amd64, linux/arm64]
2828
include:
2929
- platform: linux/amd64
30-
runs-on: ubuntu-latest
30+
runs-on: blacksmith-4vcpu-ubuntu-2404
3131
- platform: linux/arm64
32-
runs-on: ubuntu-24.04-arm
32+
runs-on: blacksmith-8vcpu-ubuntu-2204-arm
3333

3434
steps:
3535
- name: Prepare
@@ -57,8 +57,8 @@ jobs:
5757
with:
5858
cosign-release: "v2.2.4"
5959

60-
- name: Set up Docker Buildx
61-
uses: docker/setup-buildx-action@v3
60+
- name: Setup Blacksmith Builder
61+
uses: useblacksmith/setup-docker-builder@v1
6262

6363
- name: Login to GitHub Packages Docker Registry
6464
uses: docker/login-action@v3
@@ -69,12 +69,10 @@ jobs:
6969

7070
- name: Build Docker image
7171
id: build
72-
uses: docker/build-push-action@v6
72+
uses: useblacksmith/build-push-action@v2
7373
with:
7474
context: .
7575
labels: ${{ steps.meta.outputs.labels }}
76-
cache-from: type=gha
77-
cache-to: type=gha,mode=max
7876
platforms: ${{ matrix.platform }}
7977
outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true,annotation.org.opencontainers.image.description=Blazingly fast code search
8078
build-args: |
@@ -110,7 +108,7 @@ jobs:
110108
run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
111109

112110
merge:
113-
runs-on: ubuntu-latest
111+
runs-on: blacksmith-4vcpu-ubuntu-2404
114112
permissions:
115113
packages: write
116114
needs:
@@ -123,8 +121,8 @@ jobs:
123121
pattern: digests-*
124122
merge-multiple: true
125123

126-
- name: Set up Docker Buildx
127-
uses: docker/setup-buildx-action@v3
124+
- name: Setup Blacksmith Builder
125+
uses: useblacksmith/setup-docker-builder@v1
128126

129127
- name: Extract Docker metadata
130128
id: meta

.github/workflows/pr-gate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
11+
runs-on: blacksmith-4vcpu-ubuntu-2404
1212
permissions:
1313
contents: read
1414
steps:
@@ -19,6 +19,6 @@ jobs:
1919

2020
- name: Build Docker image
2121
id: build
22-
uses: docker/build-push-action@v6
22+
uses: useblacksmith/build-push-action@v2
2323
with:
2424
context: .

.github/workflows/test-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
10+
runs-on: blacksmith-4vcpu-ubuntu-2404
1111
permissions:
1212
contents: read
1313
steps:

.github/workflows/test-web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
10+
runs-on: blacksmith-4vcpu-ubuntu-2404
1111
permissions:
1212
contents: read
1313
steps:

.vscode/sourcebot.code-workspace

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
},
66
{
77
"path": "../vendor/zoekt"
8+
},
9+
{
10+
"path": "../../sourcebot-helm-chart"
811
}
912
],
1013
"settings": {

CHANGELOG.md

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,116 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## Added
11+
- [Experimental][Sourcebot EE] Added GitLab permission syncing. [#585](https://github.com/sourcebot-dev/sourcebot/pull/585)
12+
13+
### Fixed
14+
- [ask sb] Fixed issue where reasoning tokens would appear in `text` content for openai compatible models. [#582](https://github.com/sourcebot-dev/sourcebot/pull/582)
15+
- Fixed issue with GitHub app token tracking and refreshing. [#583](https://github.com/sourcebot-dev/sourcebot/pull/583)
16+
- Fixed "The account is already associated with another user" errors with GitLab oauth provider. [#584](https://github.com/sourcebot-dev/sourcebot/pull/584)
17+
18+
## [4.8.1] - 2025-10-29
19+
20+
### Fixed
21+
- Fixed commit and branch hyperlinks not rendering for Gerrit repos. [#581](https://github.com/sourcebot-dev/sourcebot/pull/581)
22+
- Fixed visual bug when a repository does not have a image. [#581](https://github.com/sourcebot-dev/sourcebot/pull/581)
23+
- Fixed issue where the Ask homepage was not scrollable. [#581](https://github.com/sourcebot-dev/sourcebot/pull/581)
24+
25+
## [4.8.0] - 2025-10-28
26+
27+
### Added
28+
- Implement dynamic tab titles for files and folders in browse tab. [#560](https://github.com/sourcebot-dev/sourcebot/pull/560)
29+
- Added support for passing db connection url as seperate `DATABASE_HOST`, `DATABASE_USERNAME`, `DATABASE_PASSWORD`, `DATABASE_NAME`, and `DATABASE_ARGS` env vars. [#545](https://github.com/sourcebot-dev/sourcebot/pull/545)
30+
- Added support for GitHub Apps for service auth. [#570](https://github.com/sourcebot-dev/sourcebot/pull/570)
31+
- Added prometheus metrics for repo index manager. [#571](https://github.com/sourcebot-dev/sourcebot/pull/571)
32+
- Added experimental environment variable to disable API key creation for non-admin users. [#577](https://github.com/sourcebot-dev/sourcebot/pull/577)
33+
- [Experimental][Sourcebot EE] Added REST API to get users and delete a user. [#578](https://github.com/sourcebot-dev/sourcebot/pull/578)
34+
35+
### Fixed
36+
- Fixed "dubious ownership" errors when cloning / fetching repos. [#553](https://github.com/sourcebot-dev/sourcebot/pull/553)
37+
- Fixed issue with Ask Sourcebot tutorial re-appearing after restarting the browser. [#563](https://github.com/sourcebot-dev/sourcebot/pull/563)
38+
- Fixed `repoIndexTimeoutMs` not being used for index job timeouts. [#567](https://github.com/sourcebot-dev/sourcebot/pull/567)
39+
40+
### Changed
41+
- Improved search performance for unbounded search queries. [#555](https://github.com/sourcebot-dev/sourcebot/pull/555)
42+
- Improved homepage performance by removing client side polling. [#563](https://github.com/sourcebot-dev/sourcebot/pull/563)
43+
- Changed navbar indexing indicator to only report progress for first time indexing jobs. [#563](https://github.com/sourcebot-dev/sourcebot/pull/563)
44+
- Improved repo indexing job stability and robustness. [#563](https://github.com/sourcebot-dev/sourcebot/pull/563)
45+
- Improved repositories table. [#572](https://github.com/sourcebot-dev/sourcebot/pull/572)
46+
- Improved connections table. [#579](https://github.com/sourcebot-dev/sourcebot/pull/579)
47+
48+
### Removed
49+
- Removed spam "login page loaded" log. [#552](https://github.com/sourcebot-dev/sourcebot/pull/552)
50+
- Removed connections management page. [#563](https://github.com/sourcebot-dev/sourcebot/pull/563)
51+
52+
## [4.7.3] - 2025-09-29
53+
54+
### Fixed
55+
- Manually pass auth token for ado server deployments. [#543](https://github.com/sourcebot-dev/sourcebot/pull/543)
56+
57+
## [4.7.2] - 2025-09-22
58+
59+
### Fixed
60+
- Fix support email. [#529](https://github.com/sourcebot-dev/sourcebot/pull/529)
61+
62+
### Added
63+
- [Experimental][Sourcebot EE] Added permission syncing repository Access Control Lists (ACLs) between Sourcebot and GitHub. [#508](https://github.com/sourcebot-dev/sourcebot/pull/508)
64+
65+
### Changed
66+
- Improved repository query performance by adding db indices. [#526](https://github.com/sourcebot-dev/sourcebot/pull/526)
67+
- Improved repository query performance by removing JOIN on `Connection` table. [#527](https://github.com/sourcebot-dev/sourcebot/pull/527)
68+
- Changed repo carousel and repo list links to redirect to the file browser. [#528](https://github.com/sourcebot-dev/sourcebot/pull/528)
69+
- Changed file headers, files/directories in file tree, and reference list buttons into links. [#532](https://github.com/sourcebot-dev/sourcebot/pull/532)
70+
71+
## [4.7.1] - 2025-09-19
72+
73+
### Fixed
74+
- Fixed sourcebot not pulling github forked repos [#499](https://github.com/sourcebot-dev/sourcebot/pull/499)
75+
- Fixed azure devop cloud pat issue [#524](https://github.com/sourcebot-dev/sourcebot/pull/524)
76+
77+
## [4.7.0] - 2025-09-17
78+
79+
### Added
80+
- Added fallback to default the Node.JS AWS SDK's `fromNodeProviderChain` when no credentials are provided for a bedrock config. [#513](https://github.com/sourcebot-dev/sourcebot/pull/513)
81+
- Added support for Azure Devops support. [#514](https://github.com/sourcebot-dev/sourcebot/pull/514)
82+
83+
### Fixed
84+
- Fixed "At least one project, user, or group must be specified" for GitLab configs with `all` in web configurator. [#512](https://github.com/sourcebot-dev/sourcebot/pull/512)
85+
- Fixed zoekt indexing failing with pipe in branch/tag names [#506](https://github.com/sourcebot-dev/sourcebot/pull/506)
86+
- Removed deprecated connection creation/edit UI [#515](https://github.com/sourcebot-dev/sourcebot/pull/515)
87+
88+
## [4.6.8] - 2025-09-15
89+
90+
### Fixed
91+
- Fixed Bitbucket Cloud pagination not working beyond first page. [#295](https://github.com/sourcebot-dev/sourcebot/issues/295)
92+
- Fixed search bar line wrapping. [#501](https://github.com/sourcebot-dev/sourcebot/pull/501)
93+
- Fixed carousel perf issues. [#507](https://github.com/sourcebot-dev/sourcebot/pull/507)
94+
95+
## [4.6.7] - 2025-09-08
96+
97+
### Added
98+
- Added `exclude.userOwnedProjects` setting to GitLab configs. [#498](https://github.com/sourcebot-dev/sourcebot/pull/498)
99+
100+
### Fixed
101+
- Fixed "couldn't find remote ref HEAD" errors when re-indexing certain repositories. [#497](https://github.com/sourcebot-dev/sourcebot/pull/497)
102+
103+
### Changed
104+
- Disable page scroll when using arrow keys on search suggestions box. [#493](https://github.com/sourcebot-dev/sourcebot/pull/493)
105+
106+
## [4.6.6] - 2025-09-04
107+
108+
### Added
109+
- Added support for specifying query params for openai compatible language models. [#490](https://github.com/sourcebot-dev/sourcebot/pull/490)
110+
111+
### Fixed
112+
- Fix issue where zoekt was failing to index repositories due to `HEAD` pointing to a branch that does not exist. [#488](https://github.com/sourcebot-dev/sourcebot/pull/488)
113+
114+
## [4.6.5] - 2025-09-02
115+
116+
### Fixed
117+
- Remove setting `remote.origin.url` for remote git repositories. [#483](https://github.com/sourcebot-dev/sourcebot/pull/483)
118+
- Fix error when navigating to paths with percentage symbols. [#485](https://github.com/sourcebot-dev/sourcebot/pull/485)
119+
10120
### Changed
11121
- Updated NextJS to version 15. [#477](https://github.com/sourcebot-dev/sourcebot/pull/477)
12122
- Add `sessionToken` as optional Bedrock configuration parameter. [#478](https://github.com/sourcebot-dev/sourcebot/pull/478)

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ ENV DATA_DIR=/data
185185
ENV DATA_CACHE_DIR=$DATA_DIR/.sourcebot
186186
ENV DATABASE_DATA_DIR=$DATA_CACHE_DIR/db
187187
ENV REDIS_DATA_DIR=$DATA_CACHE_DIR/redis
188-
ENV DATABASE_URL="postgresql://postgres@localhost:5432/sourcebot"
189188
ENV REDIS_URL="redis://localhost:6379"
190189
ENV SRC_TENANT_ENFORCEMENT_MODE=strict
191190
ENV SOURCEBOT_PUBLIC_KEY_PATH=/app/public.pem
@@ -234,6 +233,9 @@ COPY --from=shared-libs-builder /app/packages/shared ./packages/shared
234233
# Configure dependencies
235234
RUN apk add --no-cache git ca-certificates bind-tools tini jansson wget supervisor uuidgen curl perl jq redis postgresql postgresql-contrib openssl util-linux unzip
236235

236+
# Fixes git "dubious ownership" issues when the volume is mounted with different permissions to the container.
237+
RUN git config --global safe.directory "*"
238+
237239
# Configure the database
238240
RUN mkdir -p /run/postgresql && \
239241
chown -R postgres:postgres /run/postgresql && \
@@ -245,8 +247,6 @@ RUN chmod +x ./prefix-output.sh
245247
COPY entrypoint.sh ./entrypoint.sh
246248
RUN chmod +x ./entrypoint.sh
247249

248-
COPY default-config.json .
249-
250250
EXPOSE 3000
251251
ENV PORT=3000
252252
ENV HOSTNAME="0.0.0.0"

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Copyright (c) 2025 Taqla Inc.
22

33
Portions of this software are licensed as follows:
44

5-
- All content that resides under the "ee/", "packages/web/src/ee/", and "packages/shared/src/ee/" directories of this repository, if these directories exist, is licensed under the license defined in "ee/LICENSE".
5+
- All content located within any folder or subfolder named “ee” in this repository is licensed under the terms specified in ee/LICENSE”,
66
- All third party components incorporated into the Sourcebot Software are licensed under the original license provided by the owner of the applicable component.
77
- Content outside of the above mentioned directories or restrictions above is available under the "Functional Source License" as defined below.
88

0 commit comments

Comments
 (0)