Skip to content

Commit

Permalink
fix: remove Souin cache (waiting for fix)
Browse files Browse the repository at this point in the history
  • Loading branch information
vincentchalamon committed Sep 11, 2023
1 parent 86319f5 commit 5c468cc
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 36 deletions.
4 changes: 2 additions & 2 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ ARG TARGETARCH

WORKDIR /srv/app

# Download Caddy compiled with the Mercure, Vulcain and Souin modules
ADD --chmod=500 https://caddyserver.com/api/download?os=linux&arch=$TARGETARCH&p=github.com/dunglas/mercure/caddy&p=github.com/dunglas/vulcain/caddy&p=github.com/caddyserver/cache-handler /usr/bin/caddy
# Download Caddy compiled with the Mercure and Vulcain
ADD --chmod=500 https://caddyserver.com/api/download?os=linux&arch=$TARGETARCH&p=github.com/dunglas/mercure/caddy&p=github.com/dunglas/vulcain/caddy /usr/bin/caddy

COPY --link docker/caddy/Caddyfile /etc/caddy/Caddyfile

Expand Down
17 changes: 0 additions & 17 deletions api/config/packages/api_platform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,6 @@ api_platform:
scopes:
openid: (required) Indicates that the application intends to use OIDC to verify the user's identity

#when@prod:
# parameters:
# # The api url that is called to invalidate cached resources
# # Can't be set in .env file because it's only available on prod env
# env(SOUIN_API_URL): http://caddy/souin-api
#
# api_platform:
# http_cache:
# invalidation:
# enabled: true
# purger: 'api_platform.http_cache.purger.souin'
# urls: ['%env(SOUIN_API_URL)%']
# defaults:
# cache_headers:
# max_age: 0
# shared_max_age: 3600

services:
_defaults:
autowire: false
Expand Down
2 changes: 0 additions & 2 deletions api/docker/caddy/Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

log

{$CADDY_CACHE}

# Matches requests for OIDC routes
@oidc expression path('/oidc/*')

Expand Down
8 changes: 0 additions & 8 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ services:
environment:
MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}
MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET}
# CADDY_GLOBAL_OPTIONS: |
# order cache before rewrite
# cache {
# api {
# souin
# }
# }
# CADDY_CACHE: cache

database:
environment:
Expand Down
7 changes: 0 additions & 7 deletions helm/api-platform/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,6 @@ spec:
value: {{ include "api-platform.fullname" . }}-pwa:3000
- name: OIDC_UPSTREAM
value: {{ .Release.Name }}-keycloak:80
- name: CADDY_CACHE
value: cache
- name: CADDY_GLOBAL_OPTIONS
valueFrom:
configMapKeyRef:
name: {{ include "api-platform.fullname" . }}
key: caddy-global-options
- name: MERCURE_EXTRA_DIRECTIVES
valueFrom:
configMapKeyRef:
Expand Down

0 comments on commit 5c468cc

Please sign in to comment.