Simplify container setup

.gitignore

@@ -2,4 +2,3 @@
 /.venv/
 wallets-v2.proxy.json
 origins.json
-/server/nginx.conf

Dockerfile

@@ -1,51 +1,29 @@
 FROM python:3.11-alpine AS builder
 
-RUN pip install jinja2
-
 WORKDIR /build
 
-COPY server/nginx.conf.j2 /build/nginx.conf.j2
+COPY server/nginx.conf /build/nginx.conf
 COPY wallets-v2.json /build/wallets-v2.json
 COPY wallets.json /build/wallets.json
 COPY scripts/proxy_urls.py /build/proxy_urls.py
-COPY scripts/generate_nginx_conf.py /build/generate_nginx_conf.py
 
-ARG ASSETS_PREFIX=assets
 ARG SERVER_NAME=config.ton.org
-ARG CACHE_DURATION_OK=10m
-ARG CACHE_DURATION_NOTOK=2m
 
 RUN python proxy_urls.py \
     --input wallets-v2.json \
     --output wallets-v2.proxy.json \
-    --origins origins.json \
-    --base-url "https://${SERVER_NAME}/${ASSETS_PREFIX}/"
-
-RUN python generate_nginx_conf.py \
-    --template nginx.conf.j2 \
-    --origins origins.json \
-    --output nginx.conf \
-    --assets-prefix "${ASSETS_PREFIX}" \
-    --server-name "${SERVER_NAME}" \
-    --cache-duration-ok "${CACHE_DURATION_OK}" \
-    --cache-duration-notok "${CACHE_DURATION_NOTOK}"
+    --base-url "https://${SERVER_NAME}/assets/"
 
 FROM nginx:alpine
 
-ARG ASSETS_PREFIX=assets
-
-ENV NGINX_RESOLVER=8.8.8.8
+RUN rm /usr/share/nginx/html/*
 
-COPY --from=builder /build/nginx.conf /etc/nginx/nginx.conf.template
+COPY --from=builder /build/nginx.conf /etc/nginx/nginx.conf
 COPY --from=builder /build/wallets-v2.proxy.json /usr/share/nginx/html/wallets-v2.json
 COPY --from=builder /build/wallets.json /usr/share/nginx/html/wallets.json
-COPY assets/ /var/www/predownloaded_images/${ASSETS_PREFIX}/
+COPY assets/ /usr/share/nginx/html/assets/
 
-RUN mkdir -p /var/cache/nginx/image_cache && \
-    chown -R nginx:nginx /var/cache/nginx && \
-    chown -R nginx:nginx /var/www/predownloaded_images
 
 EXPOSE 80
 
-CMD envsubst '${NGINX_RESOLVER}' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf && \
-    nginx -g "daemon off;"
+CMD nginx -g "daemon off;"

docker-compose.test.yml

@@ -3,8 +3,6 @@ version: '3.8'
 services:
   ton-wallets:
     image: ${IMAGE:-ton-wallets-local}
-    environment:
-      NGINX_RESOLVER: 1.1.1.1
     ports:
       - "${TEST_PORT:-8088}:80"
     healthcheck:

server/nginx.conf

@@ -0,0 +1,40 @@
+worker_processes auto;
+pid /var/run/nginx.pid;
+error_log /dev/stdout warn;
+
+events {
+    worker_connections 1024;
+    use epoll;
+    multi_accept on;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent"';
+
+    access_log /dev/stdout main;
+
+    server {
+        listen 80;
+        server_name _;
+
+        root /usr/share/nginx/html;
+
+        location /assets/ {
+            try_files $uri =404;
+            add_header Cache-Control "public, max-age=1800"; # 15 minutes
+        }
+
+        location / {
+            try_files $uri $uri/ =404;
+        }
+
+        location = / {
+            autoindex on;
+        }
+    }
+}