Skip to content

Commit

Permalink
TECH-2410 - 1) Updating images to newest version; 2) Moving Chainlog-…
Browse files Browse the repository at this point in the history
…UI to port 8080 as current one (80) can't be handled properly with Ingress Controller
  • Loading branch information
OleksandrUA committed Nov 7, 2023
1 parent e6219b1 commit a7d6ab9
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.ui
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.21
FROM nginx:1.25

COPY api.html \
index.html \
Expand Down
6 changes: 3 additions & 3 deletions deploy/prod/chainlog-logger.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
replicaCount: 1
service:
name: chainlog-logger
port: 8080
enabled: false
type: ClusterIP
containerPort: 8080
tls:
enabled: false
deployment:
enabled: true
image:
repository: ${ECR_REGISTRY}/chainlog-logger-prod
pullPolicy: Always
Expand Down
17 changes: 10 additions & 7 deletions deploy/prod/chainlog-ui.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
replicaCount: 1
replicaCount: 2
service:
enabled: true
name: chainlog-ui
port: 80
port: 8080
type: ClusterIP
containerPort: 80
containerPort: 8080
tls:
enabled: true
issuerName: cloudflare
deployment:
enabled: true
image:
repository: ${ECR_REGISTRY}/chainlog-ui-prod
pullPolicy: Always
Expand All @@ -29,8 +32,8 @@ resources:
memory: 256Mi
autoscaling:
enabled: true
minReplicas: 1
maxReplicas: 2
minReplicas: 2
maxReplicas: 3
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 60
env:
Expand All @@ -39,7 +42,7 @@ env:
value: "localhost"
readinessProbe:
tcpSocket:
port: 80
port: 8080
livenessProbe:
tcpSocket:
port: 80
port: 8080
6 changes: 3 additions & 3 deletions deploy/staging/chainlog-logger.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
replicaCount: 1
service:
name: chainlog-logger
port: 8080
enabled: false
type: ClusterIP
containerPort: 8080
tls:
enabled: false
deployment:
enabled: true
image:
repository: ${ECR_REGISTRY}/chainlog-logger-staging
pullPolicy: IfNotPresent
Expand Down
11 changes: 7 additions & 4 deletions deploy/staging/chainlog-ui.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
replicaCount: 1
service:
enabled: true
name: chainlog-ui
port: 80
port: 8080
type: ClusterIP
containerPort: 80
containerPort: 8080
tls:
enabled: true
issuerName: cloudflare
deployment:
enabled: true
image:
repository: ${ECR_REGISTRY}/chainlog-ui-staging
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -39,7 +42,7 @@ env:
value: "localhost"
readinessProbe:
tcpSocket:
port: 80
port: 8080
livenessProbe:
tcpSocket:
port: 80
port: 8080
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
environment:
CHECKSUM_CONTAINER_NAME: checksum
ports:
- "0.0.0.0:8080:80/tcp"
- "0.0.0.0:8080:8080/tcp"
volumes:
- ./api:/usr/share/nginx/html/api
logger:
Expand Down
4 changes: 2 additions & 2 deletions nginx/nginx.conf.template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
server {
listen 80;
listen [::]:80;
listen 8080;
listen [::]:8080;
server_name localhost;

location / {
Expand Down

0 comments on commit a7d6ab9

Please sign in to comment.