diff --git a/docker/Dockerfile b/docker/Dockerfile --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,6 @@ libsvn-dev \ libsystemd-dev \ gcc \ - memcached \ openjdk-11-jre \ pkg-config \ pv \ diff --git a/docker/conf/web.yml b/docker/conf/web.yml --- a/docker/conf/web.yml +++ b/docker/conf/web.yml @@ -34,7 +34,7 @@ name: postgresql:///?service=swh-web throttling: - cache_uri: 127.0.0.1:11211 + cache_uri: memcache:11211 scopes: swh_api: limiter_rate: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -101,6 +101,10 @@ - "1025:1025" - "8025:8025" + memcache: + image: memcached + restart: unless-stopped + nginx: image: nginx volumes: @@ -277,6 +281,7 @@ - swh-scheduler - swh-storage - swh-web-db + - memcache env_file: - ./env/common_python.env - ./env/01-web-db.env diff --git a/docker/services/swh-web/entrypoint.sh b/docker/services/swh-web/entrypoint.sh --- a/docker/services/swh-web/entrypoint.sh +++ b/docker/services/swh-web/entrypoint.sh @@ -23,9 +23,6 @@ exec bash -i ;; *) - echo "Starting memcached" - memcached& - wait_pgsql echo "Migrating db using ${DJANGO_SETTINGS_MODULE}"