Skip to content

Commit fa561cf

Browse files
committed
Fix port on Docker images
1 parent 5b8ef43 commit fa561cf

15 files changed

+57
-59
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.9.0
25+
image: exceptionless/elasticsearch:8.10.3
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.9.0
41+
image: docker.elastic.co/kibana/kibana:8.10.3
4242
environment:
4343
xpack.security.enabled: "false"
4444
ports:

Dockerfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
22
WORKDIR /app
33

4-
ENV HUSKY 0
5-
64
COPY ./*.sln ./NuGet.Config ./
75
COPY ./src/*.props ./src/
86
COPY ./tests/*.props ./tests/
@@ -42,7 +40,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS job
4240
WORKDIR /app
4341
COPY --from=job-publish /app/src/Exceptionless.Job/out ./
4442

45-
EXPOSE 80 443
43+
EXPOSE 8080
4644

4745
ENTRYPOINT [ "dotnet", "Exceptionless.Job.dll" ]
4846

@@ -62,7 +60,7 @@ FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS api
6260
WORKDIR /app
6361
COPY --from=api-publish /app/src/Exceptionless.Web/out ./
6462

65-
EXPOSE 80 443
63+
EXPOSE 8080
6664

6765
ENTRYPOINT [ "dotnet", "Exceptionless.Web.dll" ]
6866

@@ -93,7 +91,7 @@ ENV EX_ConnectionStrings__Storage=provider=folder;path=/app/storage \
9391
RUN chmod +x /app/app-docker-entrypoint.sh
9492
RUN chmod +x /usr/local/bin/update-config
9593

96-
EXPOSE 80 443
94+
EXPOSE 8080
9795

9896
ENTRYPOINT ["/app/app-docker-entrypoint.sh"]
9997

@@ -149,7 +147,7 @@ RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
149147
./dotnet-install.sh --channel 8.0 --quality preview --runtime aspnetcore && \
150148
rm dotnet-install.sh
151149

152-
EXPOSE 80 443 9200
150+
EXPOSE 8080 9200
153151

154152
ENTRYPOINT ["/app/docker-entrypoint.sh"]
155153

@@ -205,7 +203,7 @@ RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
205203
./dotnet-install.sh --channel 8.0 --quality preview --runtime aspnetcore && \
206204
rm dotnet-install.sh
207205

208-
EXPOSE 80 443 9200
206+
EXPOSE 8080 9200
209207

210208
ENTRYPOINT ["/app/docker-entrypoint.sh"]
211209

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.12
5+
image: exceptionless/elasticsearch:7.17.14
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.12
19+
image: docker.elastic.co/kibana/kibana:7.17.14
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.9.0
5+
image: docker.elastic.co/elasticsearch/elasticsearch:8.10.3
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.9.0
56+
image: docker.elastic.co/elasticsearch/elasticsearch:8.10.3
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.9.0
101+
image: docker.elastic.co/kibana/kibana:8.10.3
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.9.0
127+
image: docker.elastic.co/apm/apm-server:8.10.3
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:7.17.12
53+
image: exceptionless/elasticsearch:7.17.14
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:7.17.12
67+
image: docker.elastic.co/kibana/kibana:7.17.14
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: "2.2"
22

33
services:
44
elasticsearch:
5-
image: exceptionless/elasticsearch:8.9.0
5+
image: exceptionless/elasticsearch:8.10.3
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.9.0
21+
image: docker.elastic.co/kibana/kibana:8.10.3
2222
environment:
2323
xpack.security.enabled: "false"
2424
ports:

k8s/elastic-monitor.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: elastic-monitor
55
namespace: elastic-system
66
spec:
7-
version: 8.9.0
7+
version: 8.10.3
88
nodeSets:
99
- name: main
1010
count: 2
@@ -50,7 +50,7 @@ metadata:
5050
name: kibana-monitor
5151
namespace: elastic-system
5252
spec:
53-
version: 8.9.0
53+
version: 8.10.3
5454
count: 1
5555
elasticsearchRef:
5656
name: elastic-monitor
@@ -144,7 +144,7 @@ metadata:
144144
name: fleet-server
145145
namespace: elastic-system
146146
spec:
147-
version: 8.9.0
147+
version: 8.10.3
148148
kibanaRef:
149149
name: kibana-monitor
150150
elasticsearchRefs:
@@ -168,7 +168,7 @@ metadata:
168168
name: elastic-agent
169169
namespace: elastic-system
170170
spec:
171-
version: 8.9.0
171+
version: 8.10.3
172172
kibanaRef:
173173
name: kibana-monitor
174174
fleetServerRef:

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: 8.9.0
8-
image: exceptionless/elasticsearch:8.9.0 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.10.3
8+
image: exceptionless/elasticsearch:8.10.3 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
99
secureSettings:
1010
- secretName: ex-dev-snapshots
1111
http:
@@ -57,7 +57,7 @@ metadata:
5757
name: ex-dev
5858
namespace: ex-dev
5959
spec:
60-
version: 8.9.0
60+
version: 8.10.3
6161
count: 1
6262
elasticsearchRef:
6363
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: 8.9.0
8-
image: exceptionless/elasticsearch:8.9.0 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
7+
version: 8.10.3
8+
image: exceptionless/elasticsearch:8.10.3 # https://github.com/exceptionless/Exceptionless/tree/main/build/docker/elasticsearch
99
monitoring:
1010
metrics:
1111
elasticsearchRefs:
@@ -68,7 +68,7 @@ metadata:
6868
name: ex-prod
6969
namespace: ex-prod
7070
spec:
71-
version: 8.9.0
71+
version: 8.10.3
7272
count: 1
7373
elasticsearchRef:
7474
name: ex-prod

k8s/exceptionless/templates/api.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ spec:
3333
livenessProbe:
3434
httpGet:
3535
path: /health
36-
port: 80
36+
port: 8080
3737
initialDelaySeconds: 10
3838
periodSeconds: 10
3939
readinessProbe:
4040
httpGet:
4141
path: /ready
42-
port: 80
42+
port: 8080
4343
initialDelaySeconds: 3
4444
periodSeconds: 3
4545
resources:
@@ -51,7 +51,7 @@ spec:
5151
cpu: 800m
5252
ports:
5353
- name: http
54-
containerPort: 80
54+
containerPort: 8080
5555
protocol: TCP
5656
envFrom:
5757
- configMapRef:

0 commit comments

Comments
 (0)