8 CHANGELOG.md
View file
@@ -19,6 +19,14 @@ All notable changes to Sourcegraph are documented in this file.

### Removed

## 3.15.1

### Fixed

- A potential security vulnerability with in the authentication workflow has been fixed. [#10167](https://github.com/sourcegraph/sourcegraph/pull/10167)
- An issue where `sourcegraph/postgres-11.4:3.15.0` was incorrectly an older version of the image incompatible with non-root Kubernetes deployments. `sourcegraph/postgres-11.4:3.15.1` now matches the same image version found in Sourcegraph 3.14.3 (`20-04-07_56b20163`).
- An issue that caused the search result type tabs to be overlapped in Safari. [#10191](https://github.com/sourcegraph/sourcegraph/pull/10191)

## 3.15.0

### Added
4 cmd/frontend/auth/redirect.go
View file
@@ -2,6 +2,7 @@ package auth

import (
"net/url"
"path"
"strings"
)

@@ -15,6 +16,9 @@ func SafeRedirectURL(urlStr string) string {
return "/"
}

// Make sure u.Path always starts with a single slash.
u.Path = path.Clean(u.Path)

// Only take certain known-safe fields.
u = &url.URL{Path: u.Path, RawQuery: u.RawQuery}
return u.String()
19 cmd/frontend/auth/redirect_test.go
View file
@@ -4,15 +4,16 @@ import "testing"

func TestSafeRedirectURL(t *testing.T) {
tests := map[string]string{
"": "/",
"/": "/",
"a@b.com:c": "/",
"a@b.com/c": "/",
"//a": "/",
"http://a.com/b": "/b",
"//a.com/b": "/b",
"//a@b.com/c": "/c",
"/a?b": "/a?b",
"": "/",
"/": "/",
"a@b.com:c": "/",
"a@b.com/c": "/",
"//a": "/",
"http://a.com/b": "/b",
"//a.com/b": "/b",
"//a@b.com/c": "/c",
"/a?b": "/a?b",
"//foo//example.com": "/example.com",
}
for input, want := range tests {
got := SafeRedirectURL(input)
4 cmd/frontend/internal/app/pkg/updatecheck/handler.go
View file
@@ -32,12 +32,12 @@ var (
// non-cluster, non-docker-compose, and non-pure-docker installations what the latest
//version is. The version here _must_ be available at https://hub.docker.com/r/sourcegraph/server/tags/
// before landing in master.
latestReleaseDockerServerImageBuild = newBuild("3.14.3")
latestReleaseDockerServerImageBuild = newBuild("3.15.0")

// latestReleaseKubernetesBuild is only used by sourcegraph.com to tell existing Sourcegraph
// cluster deployments what the latest version is. The version here _must_ be available in
// a tag at https://github.com/sourcegraph/deploy-sourcegraph before landing in master.
latestReleaseKubernetesBuild = newBuild("3.14.3")
latestReleaseKubernetesBuild = newBuild("3.15.0")

// latestReleaseDockerComposeOrPureDocker is only used by sourcegraph.com to tell existing Sourcegraph
// Docker Compose or Pure Docker deployments what the latest version is. The version here _must_ be
2 cmd/server/Dockerfile
View file
@@ -46,7 +46,7 @@ RUN apk update && apk add --no-cache \
# the features we can depend on. See this link for more information:
# https://github.com/sourcegraph/sourcegraph/blob/master/doc/dev/postgresql.md#version-requirements
'bash=5.0.0-r0' 'postgresql-contrib=11.7-r0' 'postgresql=11.7-r0' \
'redis=5.0.8-r0' bind-tools ca-certificates git@edge \
'redis=5.0.5-r0' bind-tools ca-certificates git@edge \
mailcap nginx openssh-client pcre su-exec tini nodejs-current=12.4.0-r0 curl

# IMPORTANT: If you update the syntect_server version below, you MUST confirm
2 doc/_resources/templates/document.html
View file
@@ -13,7 +13,7 @@
</button>
<details-menu aria-label="Sourcegraph version" class="dropdown-menu m-0 p-0" aria-labelledby="Version Dropdown">

{{/* Update these after each release. */}} {{$previousReleaseRevspec := "v3.13.2"}} {{$previousReleaseVersion := "3.13"}} {{$currentReleaseRevspec := "v3.14.3"}} {{$currentReleaseVersion := "3.14"}} {{$nextReleaseVersion := "master"}}
{{/* Update these after each release. */}} {{$previousReleaseRevspec := "v3.14.3"}} {{$previousReleaseVersion := "3.14"}} {{$currentReleaseRevspec := "v3.15.0"}} {{$currentReleaseVersion := "3.15"}} {{$nextReleaseVersion := "master"}}
<a rel="nofollow" class="dropdown-item {{if eq .ContentVersion " "}}active{{end}}" href="/{{.ContentPagePath}}">master</a>
<a rel="nofollow" class=" dropdown-item {{if eq $currentReleaseVersion .ContentVersion " "}}active{{end}}" href="/@{{$currentReleaseVersion}}/{{.ContentPagePath}}">{{$currentReleaseVersion}}<span class="current-branch ml-1">current</span></a>
<a rel="nofollow" class=" dropdown-item {{if eq $previousReleaseVersion .ContentVersion " "}}active{{end}}" href="/@{{$previousReleaseVersion}}/{{.ContentPagePath}}">{{$previousReleaseVersion}}</a>
4 doc/admin/external_database.md
View file
@@ -22,7 +22,7 @@ Add the following to your `docker run` command:
We want line breaks for readability, but backslashes to escape them do not work cross-platform.
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->
<pre class="pre-wrap start-sourcegraph-command"><code>docker run [...]<span class="virtual-br"></span> -e PGHOST=psql.mycompany.org<span class="virtual-br"></span> -e PGUSER=sourcegraph<span class="virtual-br"></span> -e PGPASSWORD=secret<span class="virtual-br"></span> -e PGDATABASE=sourcegraph<span class="virtual-br"></span> -e PGSSLMODE=require<span class="virtual-br"></span> sourcegraph/server:3.14.3</code></pre>
<pre class="pre-wrap start-sourcegraph-command"><code>docker run [...]<span class="virtual-br"></span> -e PGHOST=psql.mycompany.org<span class="virtual-br"></span> -e PGUSER=sourcegraph<span class="virtual-br"></span> -e PGPASSWORD=secret<span class="virtual-br"></span> -e PGDATABASE=sourcegraph<span class="virtual-br"></span> -e PGSSLMODE=require<span class="virtual-br"></span> sourcegraph/server:3.15.0</code></pre>

### Docker Compose

@@ -100,7 +100,7 @@ or follow the [IANA specification for Redis URLs](https://www.iana.org/assignmen
We want line breaks for readability, but backslashes to escape them do not work cross-platform.
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->
<pre class="pre-wrap"><code>docker run [...]<span class="virtual-br"></span> -e REDIS_ENDPOINT=redis.mycompany.org:6379<span class="virtual-br"></span> sourcegraph/server:3.14.3</code></pre>
<pre class="pre-wrap"><code>docker run [...]<span class="virtual-br"></span> -e REDIS_ENDPOINT=redis.mycompany.org:6379<span class="virtual-br"></span> sourcegraph/server:3.15.0</code></pre>

> NOTE: On Mac/Windows, if trying to connect to a Redis server on the same host machine, remember that Sourcegraph is running inside a Docker container inside of the Docker virtual machine. You may need to specify your actual machine IP address and not `localhost` or `127.0.0.1` as that refers to the Docker VM itself.
2 doc/admin/install/docker/aws.md
View file
@@ -33,7 +33,7 @@ This tutorial shows you how to deploy Sourcegraph to a single EC2 instance on AW
- usermod -a -G docker ec2-user
# Install and run Sourcegraph. Restart the container upon subsequent reboots
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7080 --publish 127.0.0.1:3370:3370 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.14.3' ]
- [ sh, -c, 'docker run -d --publish 80:7080 --publish 443:7080 --publish 127.0.0.1:3370:3370 --restart unless-stopped --volume /home/ec2-user/.sourcegraph/config:/etc/sourcegraph --volume /home/ec2-user/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.15.0' ]
```

- Select **Next: ...** until you get to the **Configure Security Group** page. Then add the following rules:
2 doc/admin/install/docker/digitalocean.md
View file
@@ -16,7 +16,7 @@ This tutorial shows you how to deploy Sourcegraph to a single node running on Di
1. Run the Sourcegraph Docker image as a daemon:

```
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.14.3
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.15.0
```
1. Navigate to the droplet's IP address to finish initializing Sourcegraph. If you have configured a
DNS entry for the IP, configure `externalURL` to reflect that.
2 doc/admin/install/docker/google_cloud.md
View file
@@ -23,7 +23,7 @@ This tutorial shows you how to deploy Sourcegraph to a single node running on Go
sudo apt-get install -y docker-ce
mkdir -p /root/.sourcegraph/config
mkdir -p /root/.sourcegraph/data
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.14.3
docker run -d --publish 80:7080 --publish 443:7443 --restart unless-stopped --volume /root/.sourcegraph/config:/etc/sourcegraph --volume /root/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.15.0
```

- Create your VM, then navigate to its public IP address.
4 doc/admin/install/docker/index.md
View file
@@ -12,7 +12,7 @@ It takes less than a minute to run and install Sourcegraph using Docker:
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->

<pre class="pre-wrap start-sourcegraph-command"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm<span class="virtual-br"></span> --volume ~/.sourcegraph/config:/etc/sourcegraph<span class="virtual-br"></span> --volume ~/.sourcegraph/data:/var/opt/sourcegraph<span class="virtual-br"></span> sourcegraph/server:3.14.3</code></pre>
<pre class="pre-wrap start-sourcegraph-command"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm<span class="virtual-br"></span> --volume ~/.sourcegraph/config:/etc/sourcegraph<span class="virtual-br"></span> --volume ~/.sourcegraph/data:/var/opt/sourcegraph<span class="virtual-br"></span> sourcegraph/server:3.15.0</code></pre>

Once the server is ready (logo is displayed in the terminal), navigate to the hostname or IP address on port `7080`. Create the admin account, then you'll be guided through setting up Sourcegraph for code searching and navigation.

@@ -56,7 +56,7 @@ Sourcegraph can be **tested** on Windows 10 using roughly the same steps provide
1. [Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/)
2. Using a command prompt, follow the same [installation steps provided above](#install-sourcegraph-with-docker) but remove the `--volume` arguments. For example by pasting this:

<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm<span class="virtual-br"></span> sourcegraph/server:3.14.3</code></pre>
<pre class="pre-wrap"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm<span class="virtual-br"></span> sourcegraph/server:3.15.0</code></pre>

## Insiders build

2 doc/admin/management_console.md
View file
@@ -15,7 +15,7 @@ The management console is built-in to the same Docker image and published on por
```
$ docker ps
CONTAINER ID IMAGE PORTS
394ff36a8c3c sourcegraph/server:3.14.3 0.0.0.0:2633->2633/tcp, 0.0.0.0:7080->7080/tcp
394ff36a8c3c sourcegraph/server:3.15.0 0.0.0.0:2633->2633/tcp, 0.0.0.0:7080->7080/tcp
```

Usually, you can access it through the public internet via https://my.server.ip:2633, or https://localhost:2633 when testing locally.
2 doc/admin/postgres.md
View file
@@ -39,7 +39,7 @@ docker run -p 7080:7080 -p 2633:2633 --rm \
-v ~/.sourcegraph/config:/etc/sourcegraph \
-v ~/.sourcegraph/data:/var/opt/sourcegraph \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
sourcegraph/server:3.14.3
sourcegraph/server:3.15.0
```

**3.** When the upgrade has been completed, stop the Sourcegraph container, then run again using the original `docker run` command (without mounting the Docker socket).
2 doc/admin/pprof.md
View file
@@ -23,7 +23,7 @@ kubectl port-forward sourcegraph-frontend-xxxx 6060:6060
The docker run command for the single-container server needs an additional publish flag to expose the debug port:

```bash script
docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --publish 127.0.0.1:6060:6060 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.14.3
docker run --publish 7080:7080 --publish 127.0.0.1:3370:3370 --publish 127.0.0.1:6060:6060 --rm --volume ~/.sourcegraph/config:/etc/sourcegraph --volume ~/.sourcegraph/data:/var/opt/sourcegraph sourcegraph/server:3.15.0
```

If Sourcegraph is deployed to a remote server, then access via an SSH tunnel using a tool
2 doc/admin/repo/custom_git_or_ssh_config.md
View file
@@ -11,7 +11,7 @@ For cluster environments, we have guides for configuring SSH cloning. These can
Upon the Sourcegraph Docker image container start, it copies all files from `/etc/sourcegraph/{ssh,gitconfig,netrc}` into its own `$HOME` directory. Alternatively you can create a new Docker image which inherits from Sourcegraph and then mutates the environment:

``` dockerfile
FROM sourcegraph/server:3.14.3
FROM sourcegraph/server:3.15.0
COPY gitconfig /etc/gitconfig
COPY ssh /root/.ssh
2 doc/admin/ssl_https_self_signed_cert_nginx.md
View file
@@ -91,7 +91,7 @@ docker container run \
\
--volume ~/.sourcegraph/config:/etc/sourcegraph \
--volume ~/.sourcegraph/data:/var/opt/sourcegraph \
sourcegraph/server:3.14.3
sourcegraph/server:3.15.0
```

> NOTE: We recommend removing `--publish 7080:7080` as it's not needed and traffic sent to that port is un-encrypted.
2 doc/dev/testing.md
View file
@@ -237,5 +237,5 @@ To manually test against a Kubernetes cluster, use https://k8s.sgdev.org.

For testing with a single Docker image, run something like
```
IMAGE=sourcegraph/server:3.14.3 ./dev/run-server-image.sh
IMAGE=sourcegraph/server:3.15.0 ./dev/run-server-image.sh
```
4 doc/index.md
View file
@@ -12,7 +12,7 @@ It takes less than 5 minutes to run and install Sourcegraph using Docker:
This uses line breaks that are rendered but not copy-pasted to the clipboard.
-->

<pre class="pre-wrap start-sourcegraph-command"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm<span class="virtual-br"></span> --volume ~/.sourcegraph/config:/etc/sourcegraph<span class="virtual-br"></span> --volume ~/.sourcegraph/data:/var/opt/sourcegraph<span class="virtual-br"></span> sourcegraph/server:3.14.3</code></pre>
<pre class="pre-wrap start-sourcegraph-command"><code>docker run<span class="virtual-br"></span> --publish 7080:7080 --publish 127.0.0.1:3370:3370 --rm<span class="virtual-br"></span> --volume ~/.sourcegraph/config:/etc/sourcegraph<span class="virtual-br"></span> --volume ~/.sourcegraph/data:/var/opt/sourcegraph<span class="virtual-br"></span> sourcegraph/server:3.15.0</code></pre>

Once the server is ready (logo is displayed in the terminal), navigate to the hostname or IP address on port `7080`. Create the admin account, then you'll be guided through setting up Sourcegraph for code searching and navigation.

@@ -49,7 +49,7 @@ We actively maintain the two most recent monthly releases of Sourcegraph.
Upgrades should happen across consecutive minor versions of Sourcegraph. For example, if you are
running Sourcegraph 3.1 and want to upgrade to 3.3, you should upgrade to 3.2 and then 3.3.

> The Docker server image tags follow SemVer semantics, so version `3.14.3` can be found at `sourcegraph/server:3.14.3`. You can see the full list of tags on our [Docker Hub page](https://hub.docker.com/r/sourcegraph/server/tags).
> The Docker server image tags follow SemVer semantics, so version `3.15.0` can be found at `sourcegraph/server:3.15.0`. You can see the full list of tags on our [Docker Hub page](https://hub.docker.com/r/sourcegraph/server/tags).
## Documentation

2 docker-images/grafana/Dockerfile
View file
@@ -6,7 +6,7 @@ RUN CGO_ENABLED=0 go build -o /go/bin/src-observability-generator
RUN mkdir -p /generated/grafana
RUN PROMETHEUS_DIR='' GRAFANA_DIR=/generated/grafana /go/bin/src-observability-generator

RUN apk add --no-cache bash=5.0.11-r1 git=2.24.2-r0 openssh=8.1_p1-r0 build-base=0.5-r1
RUN apk add --no-cache bash=5.0.11-r1 git=2.24.3-r0 openssh=8.1_p1-r0 build-base=0.5-r1

WORKDIR /opt
RUN git clone --branch v0.14.0 https://github.com/google/jsonnet.git
29 docker-images/jaeger-agent/Dockerfile
View file
@@ -0,0 +1,29 @@
# This Dockerfile tracks jaegertracing/jaeger-agent, but includes more debugging tools and runs as a
# non-root user. It requires JAEGER_VERSION to be set as an argument to build.
ARG JAEGER_VERSION
FROM jaegertracing/jaeger-agent:${JAEGER_VERSION} as base

FROM alpine:3.11.5@sha256:cb8a924afdf0229ef7515d9e5b3024e23b3eb03ddbba287f4a19c6ac90b8d221
RUN apk add --no-cache bash=5.0.11-r1 curl=7.67.0-r0

COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=base /go/bin/agent-linux /go/bin/agent-linux

RUN adduser -S -u 10001 jaeger
RUN chown jaeger /go/bin/agent-linux
USER jaeger

EXPOSE 5775/udp 6831/udp 6832/udp 5778
ENTRYPOINT ["/go/bin/agent-linux"]

ARG COMMIT_SHA="unknown"
ARG DATE="unknown"
ARG VERSION="unknown"

LABEL org.opencontainers.image.revision=${COMMIT_SHA}
LABEL org.opencontainers.image.created=${DATE}
LABEL org.opencontainers.image.version=${VERSION}
LABEL org.opencontainers.image.url=https://sourcegraph.com/
LABEL org.opencontainers.image.source=https://github.com/sourcegraph/sourcegraph/
LABEL org.opencontainers.image.documentation=https://docs.sourcegraph.com/
LABEL com.sourcegraph.jaeger.version=${JAEGER_VERSION}
23 docker-images/jaeger-agent/build.sh 100644 → 100755
View file
@@ -1,10 +1,17 @@
#!/bin/bash

set -euo pipefail

cd $(dirname "${BASH_SOURCE[0]}")
set -ex

# This merely re-tags the image to match our official versioning scheme. The
# actual image currently lives here: https://github.com/sourcegraph/infrastructure/tree/master/docker-images
#
# TODO: Move the image to this directory so it is open-source and built in CI automatically.
docker pull index.docker.io/sourcegraph/jaeger-agent:1.17.1@sha256:03ddce35d7bdbacdedc90369df84395e9aecfa51571ef661e5128ac1e95b8d5c
docker tag index.docker.io/sourcegraph/jaeger-agent:1.17.1@sha256:03ddce35d7bdbacdedc90369df84395e9aecfa51571ef661e5128ac1e95b8d5c $IMAGE

export JAEGER_VERSION="${JAEGER_VERSION:-1.17.1}"
IMAGE=${IMAGE:-sourcegraph/jaeger-agent}

echo "Building image ${IMAGE} from Jaeger ${JAEGER_VERSION}"

docker build --no-cache -t ${IMAGE} . \
--progress=plain \
--build-arg JAEGER_VERSION \
--build-arg COMMIT_SHA \
--build-arg DATE \
--build-arg VERSION
61 docker-images/jaeger-all-in-one/Dockerfile
View file
@@ -0,0 +1,61 @@
# This Dockerfile tracks jaegertracing/all-in-one
# (https://github.com/jaegertracing/jaeger/blob/master/cmd/all-in-one/Dockerfile), but includes more
# debugging tools and runs as a non-root user. It requires JAEGER_VERSION to be set as an argument
# to build.
ARG JAEGER_VERSION
FROM jaegertracing/all-in-one:${JAEGER_VERSION} as base

FROM alpine:3.11.5@sha256:cb8a924afdf0229ef7515d9e5b3024e23b3eb03ddbba287f4a19c6ac90b8d221
RUN apk add --no-cache bash=5.0.11-r1 curl=7.67.0-r0

COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=base /go/bin/all-in-one-linux /go/bin/all-in-one-linux
COPY --from=base /etc/jaeger/sampling_strategies.json /etc/jaeger/sampling_strategies.json

RUN adduser -S -u 10001 jaeger
RUN chown jaeger /go/bin/all-in-one-linux
RUN chown jaeger /etc/jaeger/sampling_strategies.json
USER jaeger

# Agent zipkin.thrift compact
EXPOSE 5775/udp

# Agent jaeger.thrift compact
EXPOSE 6831/udp

# Agent jaeger.thrift binary
EXPOSE 6832/udp

# Agent config HTTP
EXPOSE 5778

# Collector HTTP
EXPOSE 14268

# Collector gRPC
EXPOSE 14250

# Web HTTP
EXPOSE 16686

# Ensure the /tmp directory is chown'd to user jaeger
USER root
RUN mkdir -p /tmp
RUN chown -R jaeger /tmp
USER jaeger
VOLUME ["/tmp"]

ENTRYPOINT ["/go/bin/all-in-one-linux"]
CMD ["--sampling.strategies-file=/etc/jaeger/sampling_strategies.json"]

ARG COMMIT_SHA="unknown"
ARG DATE="unknown"
ARG VERSION="unknown"

LABEL org.opencontainers.image.revision=${COMMIT_SHA}
LABEL org.opencontainers.image.created=${DATE}
LABEL org.opencontainers.image.version=${VERSION}
LABEL org.opencontainers.image.url=https://sourcegraph.com/
LABEL org.opencontainers.image.source=https://github.com/sourcegraph/sourcegraph/
LABEL org.opencontainers.image.documentation=https://docs.sourcegraph.com/
LABEL com.sourcegraph.jaeger.version=${JAEGER_VERSION}
23 docker-images/jaeger-all-in-one/build.sh 100644 → 100755
View file
@@ -1,10 +1,17 @@
#!/bin/bash

set -euo pipefail

cd $(dirname "${BASH_SOURCE[0]}")
set -ex

# This merely re-tags the image to match our official versioning scheme. The
# actual image currently lives here: https://github.com/sourcegraph/infrastructure/tree/master/docker-images
#
# TODO: Move the image to this directory so it is open-source and built in CI automatically.
docker pull index.docker.io/sourcegraph/jaeger-all-in-one:1.17.1@sha256:46bfa2ac08dd08181ab443ef966d664048a6c6ac725054bcc1fbfda5bd4040a3
docker tag index.docker.io/sourcegraph/jaeger-all-in-one:1.17.1@sha256:46bfa2ac08dd08181ab443ef966d664048a6c6ac725054bcc1fbfda5bd4040a3 $IMAGE

export JAEGER_VERSION="${JAEGER_VERSION:-1.17.1}"
IMAGE=${IMAGE:-sourcegraph/jaeger-all-in-one}

echo "Building image ${IMAGE} from Jaeger ${JAEGER_VERSION}"

docker build --no-cache -t ${IMAGE} . \
--progress=plain \
--build-arg JAEGER_VERSION \
--build-arg COMMIT_SHA \
--build-arg DATE \
--build-arg VERSION
10 docker-images/jaeger-collector/build.sh
View file

This file was deleted.

10 docker-images/jaeger-query/build.sh
View file

This file was deleted.

6 docker-images/postgres-11.4/build.sh
View file
@@ -3,8 +3,8 @@ cd $(dirname "${BASH_SOURCE[0]}")
set -ex

# This merely re-tags the image to match our official versioning scheme. The
# actual image currently lives here: https://github.com/sourcegraph/infrastructure/tree/master/docker-images
# actual image currently lives here: https://github.com/sourcegraph/infrastructure/tree/master/docker-images
#
# TODO: Move the image to this directory so it is open-source and built in CI automatically.
docker pull index.docker.io/sourcegraph/postgres-11.4:19-11-14_b084311b@sha256:072481559d559cfd9a53ad77c3688b5cf583117457fd452ae238a20405923297
docker tag index.docker.io/sourcegraph/postgres-11.4:19-11-14_b084311b@sha256:072481559d559cfd9a53ad77c3688b5cf583117457fd452ae238a20405923297 $IMAGE
docker pull index.docker.io/sourcegraph/postgres-11.4:20-04-07_56b20163@sha256:63090799b34b3115a387d96fe2227a37999d432b774a1d9b7966b8c5d81b56ad
docker tag index.docker.io/sourcegraph/postgres-11.4:20-04-07_56b20163@sha256:63090799b34b3115a387d96fe2227a37999d432b774a1d9b7966b8c5d81b56ad "$IMAGE"
2 enterprise/dev/ci/ci/pipeline-steps.go
View file
@@ -32,6 +32,8 @@ var allDockerImages = []string{
"redis-store",
"search-indexer",
"syntax-highlighter",
"jaeger-agent",
"jaeger-all-in-one",
}

// Verifies the docs formatting and builds the `docsite` command.
2 web/src/e2e/e2e.test.ts
View file
@@ -1476,7 +1476,7 @@ describe('e2e test suite', () => {
})
})

describe('Campaigns', () => {
describe.skip('Campaigns', () => {
let previousExperimentalFeatures: any
before(async () => {
await driver.setConfig(['experimentalFeatures'], prev => {
6 web/src/search/results/SearchResultTypeTabs.scss
View file

This file was deleted.

2 web/src/search/results/SearchResultTypeTabs.tsx
View file
@@ -13,7 +13,7 @@ interface Props
}

export const SearchResultTypeTabs: React.FunctionComponent<Props> = props => (
<div className="search-result-type-tabs e2e-search-result-type-tabs border-bottom">
<div className="mt-2 border-bottom e2e-search-result-type-tabs">
<ul className="nav nav-tabs border-bottom-0">
<SearchResultTabHeader {...props} type={null} />
<SearchResultTabHeader {...props} type="diff" />
1 web/src/search/results/SearchResults.scss
View file
@@ -2,4 +2,3 @@
@import './SearchResultsList';
@import '../FilterChip';
@import './SearchResultsFilterBars';
@import './SearchResultTypeTabs';