Skip to content

Commit

Permalink
Merge pull request #1192 from PokeAPI/update-ci
Browse files Browse the repository at this point in the history
Update ci deps
  • Loading branch information
Naramsim authored Jan 22, 2025
2 parents 9923154 + 7f43c61 commit be3c01b
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
command: make build-db
deploy:
machine:
image: ubuntu-2204:2023.10.1
image: ubuntu-2204:2024.11.1
resource_class: large
steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-k8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Lint k8s
run: (cd Resources/k8s/kustomize && yamllint .)
- name: Create k8s Kind Cluster
uses: helm/kind-action@v1.10.0
uses: helm/kind-action@v1.12.0
with:
cluster_name: pokeapi
version: v0.21.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
done;
containers:
- name: graphql-engine
image: hasura/graphql-engine:v2.36.4
image: hasura/graphql-engine:v2.45.1
ports:
- containerPort: 8080
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
serviceAccountName: ingress-controller
containers:
- name: haproxy-ingress-controller
image: quay.io/jcmoraisjr/haproxy-ingress:v0.14.0
image: quay.io/jcmoraisjr/haproxy-ingress:v0.14.7
resources:
limits:
memory: "256Mi"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
initContainers:
- name: postgres-connection-checker
image: postgres:15.1-alpine
image: postgres:17.2-alpine3.21
command: ['sh', '-c']
args:
- until pg_isready -h postgresql -p 5432; do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: postgresql
image: postgres:15.1-alpine
image: postgres:17.2-alpine3.21
ports:
- containerPort: 5432
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: redis
image: redis:7.0.7-alpine
image: redis:7.4.2-alpine3.21
ports:
- containerPort: 6379
resources: {}
Expand Down
2 changes: 1 addition & 1 deletion Resources/k8s/kustomize/base/jobs/load-graphql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
command: ["sh", "-c"]
args:
- apt-get update && apt-get install -y curl git &&
curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | VERSION=v2.36.4 bash &&
curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | VERSION=v2.45.1 bash &&
cd /tmp &&
git clone https://github.com/PokeAPI/pokeapi.git &&
cd pokeapi &&
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
version: '2.4'
services:
cache:
image: redis:7.2.3-alpine
image: redis:7.4.2-alpine3.21
volumes:
- redis_data:/data
restart: always

db:
image: postgres:16.1
image: postgres:17.2-alpine3.21
environment:
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-pokemon}
POSTGRES_USER: ${POSTGRES_USER:-ash}
Expand Down Expand Up @@ -40,7 +40,7 @@ services:
restart: always

web:
image: nginx:1.25.3-alpine
image: nginx:1.27.3-alpine3.20
ports:
- "80:80"
- "443:443"
Expand All @@ -51,7 +51,7 @@ services:
- ./Resources/nginx/ssl:/ssl:ro
- graphql_cache:/tmp/cache
graphql-engine:
image: hasura/graphql-engine:v2.36.4
image: hasura/graphql-engine:v2.45.1
ports:
- "8080:8080"
depends_on:
Expand Down

0 comments on commit be3c01b

Please sign in to comment.