Skip to content

Commit 2dc655f

Browse files
committed
Update ES and deps
1 parent 16ab8e5 commit 2dc655f

File tree

12 files changed

+23
-29
lines changed

12 files changed

+23
-29
lines changed

Dockerfile

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
7979

8080
# completely self-contained
8181

82-
FROM exceptionless/elasticsearch:7.15.0 AS exceptionless
82+
FROM exceptionless/elasticsearch:7.15.2 AS exceptionless
8383

8484
WORKDIR /app
8585
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
@@ -89,16 +89,10 @@ COPY --from=ui /usr/local/bin/update-config /usr/local/bin/update-config
8989
COPY ./build/docker-entrypoint.sh ./
9090
COPY ./build/supervisord.conf /etc/
9191

92-
# install 6.0 from script until it's available in RPM
93-
RUN mkdir $HOME/dotnet_install && \
94-
cd $HOME/dotnet_install && \
95-
curl -H 'Cache-Control: no-cache' -L https://aka.ms/install-dotnet-preview -o install-dotnet-preview.sh && \
96-
bash install-dotnet-preview.sh
97-
9892
# install dotnet and supervisor
99-
#RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm && \
100-
# yum -y install aspnetcore-runtime-6.0 && \
101-
RUN yum -y install epel-release && \
93+
RUN rpm -Uvh https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm && \
94+
yum -y install aspnetcore-runtime-6.0 && \
95+
yum -y install epel-release && \
10296
yum -y install supervisor
10397

10498
ENV discovery.type=single-node \

build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0" PrivateAssets="All"/>
21+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
2222
<PackageReference Include="AsyncFixer" Version="1.5.1" PrivateAssets="All" />
2323
<PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All" />
2424
</ItemGroup>

docker-compose.dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
- appdata:/app/storage
5353

5454
elasticsearch:
55-
image: exceptionless/elasticsearch:7.15.0
55+
image: exceptionless/elasticsearch:7.15.2
5656
environment:
5757
discovery.type: single-node
5858
xpack.security.enabled: 'false'
@@ -66,7 +66,7 @@ services:
6666
kibana:
6767
depends_on:
6868
- elasticsearch
69-
image: docker.elastic.co/kibana/kibana:7.15.0
69+
image: docker.elastic.co/kibana/kibana:7.15.2
7070
ports:
7171
- 5601:5601
7272

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: '3.5'
55

66
services:
77
elasticsearch:
8-
image: exceptionless/elasticsearch:7.15.0
8+
image: exceptionless/elasticsearch:7.15.2
99
environment:
1010
discovery.type: single-node
1111
xpack.security.enabled: 'false'
@@ -16,12 +16,12 @@ services:
1616
kibana:
1717
depends_on:
1818
- elasticsearch
19-
image: docker.elastic.co/kibana/kibana:7.15.0
19+
image: docker.elastic.co/kibana/kibana:7.15.2
2020
ports:
2121
- 5601:5601
2222

2323
apm:
24-
image: docker.elastic.co/apm/apm-server:7.15.0
24+
image: docker.elastic.co/apm/apm-server:7.15.2
2525
depends_on:
2626
- elasticsearch
2727
ports:

k8s/ex-dev-elasticsearch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: ex-dev
55
namespace: ex-dev
66
spec:
7-
version: 7.15.0
8-
image: exceptionless/elasticsearch:7.15.0 # https://github.com/exceptionless/Exceptionless/tree/master/build/docker/elasticsearch
7+
version: 7.15.2
8+
image: exceptionless/elasticsearch:7.15.2 # https://github.com/exceptionless/Exceptionless/tree/master/build/docker/elasticsearch
99
secureSettings:
1010
- secretName: ex-dev-snapshots
1111
http:
@@ -58,7 +58,7 @@ metadata:
5858
name: ex-dev
5959
namespace: ex-dev
6060
spec:
61-
version: 7.15.0
61+
version: 7.15.2
6262
count: 1
6363
elasticsearchRef:
6464
name: ex-dev

k8s/ex-prod-elasticsearch.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ metadata:
44
name: ex-prod
55
namespace: ex-prod
66
spec:
7-
version: 7.15.0
8-
image: exceptionless/elasticsearch:7.15.0 # https://github.com/exceptionless/Exceptionless/tree/master/build/docker/elasticsearch
7+
version: 7.15.2
8+
image: exceptionless/elasticsearch:7.15.2 # https://github.com/exceptionless/Exceptionless/tree/master/build/docker/elasticsearch
99
secureSettings:
1010
- secretName: ex-prod-snapshots
1111
http:
@@ -59,7 +59,7 @@ metadata:
5959
name: ex-prod
6060
namespace: ex-prod
6161
spec:
62-
version: 7.15.0
62+
version: 7.15.2
6363
count: 1
6464
elasticsearchRef:
6565
name: ex-prod

samples/docker-compose.all-in-one.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
kibana:
2121
depends_on:
2222
- elasticsearch
23-
image: docker.elastic.co/kibana/kibana:7.15.0
23+
image: docker.elastic.co/kibana/kibana:7.15.2
2424
ports:
2525
- 5601:5601
2626

samples/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
- ex_appdata:/app/storage
4747

4848
elasticsearch:
49-
image: exceptionless/elasticsearch:7.15.0
49+
image: exceptionless/elasticsearch:7.15.2
5050
environment:
5151
discovery.type: single-node
5252
xpack.security.enabled: 'false'
@@ -60,7 +60,7 @@ services:
6060
kibana:
6161
depends_on:
6262
- elasticsearch
63-
image: docker.elastic.co/kibana/kibana:7.15.0
63+
image: docker.elastic.co/kibana/kibana:7.15.2
6464
ports:
6565
- 5601:5601
6666

src/Exceptionless.Core/Exceptionless.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
3333
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.0" />
3434
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
35-
<PackageReference Include="Stripe.net" Version="39.76.0" />
35+
<PackageReference Include="Stripe.net" Version="39.77.0" />
3636
<PackageReference Include="System.DirectoryServices" Version="6.0.0" />
3737
<PackageReference Include="UAParser" Version="3.1.47" />
3838

src/Exceptionless.Insulation/Exceptionless.Insulation.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<PackageReference Include="App.Metrics.Reporting.Graphite" Version="4.2.0" />
77
<PackageReference Include="App.Metrics.Reporting.Http" Version="4.2.0" />
88
<PackageReference Include="App.Metrics.Reporting.InfluxDB" Version="4.2.0" />
9-
<PackageReference Include="StackExchange.Redis" Version="2.2.79" />
9+
<PackageReference Include="StackExchange.Redis" Version="2.2.88" />
1010
<PackageReference Include="Geocoding.Google" Version="4.0.1" />
1111
<PackageReference Include="MaxMind.GeoIP2" Version="4.0.1" />
1212
<PackageReference Include="Foundatio.Aliyun" Version="10.2.2" />

0 commit comments

Comments
 (0)