Skip to content

Commit bd4fd97

Browse files
ejsmithejsmith
committed
Merge branch 'main' into feature/aspire
2 parents b9fa64f + d89fcd7 commit bd4fd97

File tree

78 files changed

+452
-393
lines changed

Some content is hidden

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

78 files changed

+452
-393
lines changed

‎.devcontainer/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
# (Adding the "ports" property to this file will not forward from a Codespace.)
2323

2424
elasticsearch:
25-
image: exceptionless/elasticsearch:8.11.1
25+
image: exceptionless/elasticsearch:8.13.1
2626
environment:
2727
node.name: elasticsearch
2828
cluster.name: exceptionless
@@ -38,7 +38,7 @@ services:
3838
kibana:
3939
depends_on:
4040
- elasticsearch
41-
image: docker.elastic.co/kibana/kibana:8.11.1
41+
image: docker.elastic.co/kibana/kibana:8.13.1
4242
environment:
4343
xpack.security.enabled: "false"
4444
ports:

‎.github/workflows/build.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
name: Build
2-
on: [push, pull_request]
2+
3+
on:
4+
push:
5+
branches: [main]
6+
tags: ['v*']
7+
pull_request:
8+
39
env:
410
TERM: xterm
511
DOTNET_SYSTEM_CONSOLE_ALLOW_ANSI_COLOR_REDIRECTION: true
@@ -144,7 +150,7 @@ jobs:
144150
- name: Run Integration Tests
145151
run: echo "npm run test:integration"
146152

147-
build-docker:
153+
build-and-push-docker:
148154

149155
runs-on: ubuntu-latest
150156
needs: [version]
@@ -206,7 +212,7 @@ jobs:
206212
username: ${{ env.DOCKER_USERNAME }}
207213
password: ${{ secrets.DOCKER_PASSWORD }}
208214

209-
- name: Wait for test jobs
215+
- name: Wait for test jobs # doing it this way so we don't have to copy artifacts between jobs
210216
uses: yogeshlonkar/wait-for-jobs@v0
211217
with:
212218
jobs: 'test-api,test-client'
@@ -245,7 +251,7 @@ jobs:
245251
246252
deploy:
247253
if: "${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) && github.event_name != 'pull_request' }}"
248-
needs: [version,build-docker]
254+
needs: [version,build-and-push-docker]
249255
runs-on: ubuntu-latest
250256
timeout-minutes: 30
251257
env:
@@ -260,9 +266,7 @@ jobs:
260266

261267
- name: Install Helm
262268
if: "${{ env.DOCKER_USERNAME != '' && github.event_name != 'pull_request' }}"
263-
uses: azure/setup-helm@v3
264-
with:
265-
version: v3.13.0
269+
uses: azure/setup-helm@v4
266270

267271
- name: Deploy Changes to Development Environment
268272
if: "${{ env.DOCKER_USERNAME != '' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request' }}"

‎Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
9999

100100
# completely self-contained
101101

102-
FROM exceptionless/elasticsearch:8.11.1 AS exceptionless
102+
FROM exceptionless/elasticsearch:8.13.1 AS exceptionless
103103

104104
WORKDIR /app
105105
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
@@ -157,7 +157,7 @@ ENTRYPOINT ["/app/docker-entrypoint.sh"]
157157

158158
# completely self-contained 7.x
159159

160-
FROM exceptionless/elasticsearch:7.17.18 AS exceptionless7
160+
FROM exceptionless/elasticsearch:7.17.19 AS exceptionless7
161161

162162
WORKDIR /app
163163
COPY --from=job-publish /app/src/Exceptionless.Job/out ./

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
[![Build](https://github.com/exceptionless/Exceptionless/workflows/Build/badge.svg?branch=main)](https://github.com/exceptionless/Exceptionless/actions?query=branch%3Amain)
55
[![Discord](https://img.shields.io/discord/715744504891703319)](https://discord.gg/6HxgFCx)
6+
[![BuiltWithDot.Net shield](https://builtwithdot.net/project/100/exceptionless-csharp-error-reporting/badge)](https://builtwithdot.net/project/100/exceptionless-csharp-error-reporting)
67

78
The definition of the word exceptionless is: to be without exception. [Exceptionless](https://exceptionless.com) provides real-time error reporting for your JavaScript, Node, .NET Core, ASP.NET, Web API, WebForms, WPF, Console, and MVC apps. It organizes the gathered information into simple actionable data that will help your app become exceptionless!
89

‎build/docker/elasticsearch/7.x/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://www.docker.elastic.co/
2-
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.18
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.19
33

44
RUN elasticsearch-plugin install -b mapper-size
55
RUN elasticsearch-plugin install -b repository-azure

‎build/docker/elasticsearch/8.x/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# https://www.docker.elastic.co/
2-
FROM docker.elastic.co/elasticsearch/elasticsearch:8.12.1
2+
FROM docker.elastic.co/elasticsearch/elasticsearch:8.13.1
33

44
RUN elasticsearch-plugin install -b mapper-size
5-
RUN elasticsearch-plugin install -b repository-azure
6-
RUN elasticsearch-plugin install -b repository-s3
5+

‎docker/docker-compose.7x.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2.2"
22

33
services:
44
elasticsearch:
5-
image: exceptionless/elasticsearch:7.17.18
5+
image: exceptionless/elasticsearch:7.17.19
66
environment:
77
discovery.type: single-node
88
xpack.security.enabled: "false"
@@ -16,7 +16,7 @@ services:
1616
kibana:
1717
depends_on:
1818
- elasticsearch
19-
image: docker.elastic.co/kibana/kibana:7.17.18
19+
image: docker.elastic.co/kibana/kibana:7.17.19
2020
ports:
2121
- 5601:5601
2222

‎docker/docker-compose.apm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2.2"
22

33
services:
44
setup:
5-
image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1
5+
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.1
66
volumes:
77
- certs:/usr/share/elasticsearch/config/certs
88
user: "0"
@@ -53,7 +53,7 @@ services:
5353
depends_on:
5454
setup:
5555
condition: service_healthy
56-
image: docker.elastic.co/elasticsearch/elasticsearch:8.12.1
56+
image: docker.elastic.co/elasticsearch/elasticsearch:8.13.1
5757
volumes:
5858
- certs:/usr/share/elasticsearch/config/certs
5959
- esdata:/usr/share/elasticsearch/data
@@ -98,7 +98,7 @@ services:
9898
depends_on:
9999
elasticsearch:
100100
condition: service_healthy
101-
image: docker.elastic.co/kibana/kibana:8.12.1
101+
image: docker.elastic.co/kibana/kibana:8.13.1
102102
volumes:
103103
- certs:/usr/share/kibana/config/certs
104104
ports:
@@ -124,7 +124,7 @@ services:
124124
depends_on:
125125
elasticsearch:
126126
condition: service_healthy
127-
image: docker.elastic.co/apm/apm-server:8.12.1
127+
image: docker.elastic.co/apm/apm-server:8.13.1
128128
volumes:
129129
- certs:/usr/share/apm-server/certs
130130
ports:

‎docker/docker-compose.dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ services:
5050
- appdata:/app/storage
5151

5252
elasticsearch:
53-
image: exceptionless/elasticsearch:8.12.1
53+
image: exceptionless/elasticsearch:8.13.1
5454
environment:
5555
discovery.type: single-node
5656
xpack.security.enabled: "false"
@@ -64,7 +64,7 @@ services:
6464
kibana:
6565
depends_on:
6666
- elasticsearch
67-
image: docker.elastic.co/kibana/kibana:8.12.1
67+
image: docker.elastic.co/kibana/kibana:8.13.1
6868
ports:
6969
- 5601:5601
7070

‎docker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "3.9"
22

33
services:
44
elasticsearch:
5-
image: exceptionless/elasticsearch:8.12.1
5+
image: exceptionless/elasticsearch:8.13.1
66
environment:
77
node.name: elasticsearch
88
cluster.name: exceptionless
@@ -18,7 +18,7 @@ services:
1818
kibana:
1919
depends_on:
2020
- elasticsearch
21-
image: docker.elastic.co/kibana/kibana:8.12.1
21+
image: docker.elastic.co/kibana/kibana:8.13.1
2222
environment:
2323
xpack.security.enabled: "false"
2424
ports:

0 commit comments

Comments
 (0)