Update docker compose files

5afe · Oct 10, 2022 · 4eb2d25 · 4eb2d25
1 parent e86acc4
commit 4eb2d25
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -29,7 +29,7 @@ services:
     command: docker/web/celery/worker/run.sh
 
   ganache:
-    image: trufflesuite/ganache-cli
-    command: -d --defaultBalanceEther 10000 --gasLimit 10000000 -a 30 --chain.chainId 1337 --chain.networkId 1337
+    image: trufflesuite/ganache:latest
+    command: --defaultBalanceEther 10000 --gasLimit 10000000 -a 30 --chain.chainId 1337 --chain.networkId 1337 -d
     ports:
       - "8545:8545"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ volumes:
 
 services:
   nginx:
-    image: nginx:1.21-alpine
+    image: nginx:1-alpine
     hostname: nginx
     ports:
       - "8000:8000"
@@ -16,7 +16,7 @@ services:
       - web
 
   redis:
-    image: redis:5-alpine
+    image: redis:7-alpine
     ports:
       - "6379:6379"
 

diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile
@@ -1,23 +1,24 @@
 FROM python:3.10-slim
 
-ENV PYTHONUNBUFFERED 1
-WORKDIR /app
+ARG APP_HOME=/app
+WORKDIR ${APP_HOME}
+ENV PYTHONUNBUFFERED=1
 
-# Signal handling for PID1 https://github.com/krallin/tini
-ENV TINI_VERSION v0.19.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
-RUN chmod +x /tini
+# https://eth-hash.readthedocs.io/en/latest/quickstart.html#specify-backend-by-environment-variable
+# `pysha3` is way faster than `pycryptodome` for CPython
+ENV ETH_HASH_BACKEND=pysha3
 
 COPY requirements.txt ./
 RUN set -ex \
 	&& buildDeps=" \
 		build-essential \
+        git \
 		libssl-dev \
-		libgmp-dev \
-		pkg-config \
+        libpq-dev \
 		" \
     && apt-get update \
-    && apt-get install -y --no-install-recommends $buildDeps \
+    && apt-get install -y --no-install-recommends $buildDeps tmux postgresql-client \
+    && pip install -U --no-cache-dir wheel setuptools pip \
     && pip install --no-cache-dir -r requirements.txt \
     && apt-get purge -y --auto-remove $buildDeps \
     && rm -rf /var/lib/apt/lists/* \
@@ -28,5 +29,3 @@ RUN set -ex \
 
 COPY . .
 RUN DJANGO_SETTINGS_MODULE=config.settings.local DJANGO_DOT_ENV_FILE=.env.local python manage.py collectstatic --noinput
-
-ENTRYPOINT ["/tini", "--"]