Merge branch 'main' into ci

lichess-org · Mar 30, 2024 · d4a1599 · d4a1599
2 parents c477c39 + bd80f63
commit d4a1599
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 106 deletions.
diff --git a/command/Cargo.lock b/command/Cargo.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   mongodb:
-    image: mongo:5.0.25-focal
+    image: mongo:5.0.26-focal
     restart: unless-stopped
     networks:
       - lila-network
@@ -15,9 +15,9 @@ services:
       - lila-network
 
   lila:
-    build:
-      context: docker
-      dockerfile: lila.Dockerfile
+    image: sbtscala/scala-sbt:eclipse-temurin-alpine-21.0.2_13_1.9.9_3.4.1
+    working_dir: /lila
+    entrypoint: ./lila run
     restart: unless-stopped
     networks:
       - lila-network
@@ -34,9 +34,9 @@ services:
       - ./conf/lila.conf:/lila/conf/application.conf
 
   lila_ws:
-    build:
-      context: docker
-      dockerfile: lila-ws.Dockerfile
+    image: sbtscala/scala-sbt:eclipse-temurin-alpine-21.0.2_13_1.9.9_3.4.1
+    working_dir: /lila-ws
+    entrypoint: sbt run -Dconfig.file=/lila-ws.conf
     restart: unless-stopped
     networks:
       - lila-network
@@ -77,9 +77,9 @@ services:
       - mobile
 
   api_docs:
-    build:
-      context: docker
-      dockerfile: api-docs.Dockerfile
+    image: node:20.12.0-alpine3.19
+    working_dir: /api/doc
+    entrypoint: ["/bin/sh", "-c", "npm install && npm run serve -- --host=0.0.0.0"]
     restart: unless-stopped
     ports:
       - 8089:8089
@@ -91,32 +91,36 @@ services:
   chessground:
     build:
       context: docker
-      dockerfile: chessground.Dockerfile
+      dockerfile: ui.Dockerfile
+    entrypoint: ["/bin/sh", "-c", "pnpm install && pnpm run compile && pnpx http-server -p 8080"]
     restart: unless-stopped
     ports:
       - 8090:8080
     volumes:
-      - ./repos/chessground:/chessground
+      - ./repos/chessground:/app
     profiles:
       - chessground
 
   pgn_viewer:
     build:
       context: docker
-      dockerfile: pgn-viewer.Dockerfile
+      dockerfile: ui.Dockerfile
+    entrypoint: ["/bin/sh", "-c", "pnpm install && pnpm run demo"]
     restart: unless-stopped
     ports:
       - 8091:8080
     volumes:
-      - ./repos/pgn-viewer:/pgn-viewer
+      - ./repos/pgn-viewer:/app
     profiles:
       - pgn-viewer
 
   lila_engine:
-    build:
-      context: docker
-      dockerfile: lila-engine.Dockerfile
+    image: rust:1.77.0-slim-bookworm
+    working_dir: /lila-engine
+    entrypoint: cargo run -- --bind 0.0.0.0:9666 --mongodb mongodb://mongodb
     restart: unless-stopped
+    environment:
+      - LILA_ENGINE_LOG=lila_engine=debug,tower_http=debug
     networks:
       - lila-network
     ports:
@@ -127,11 +131,15 @@ services:
       - external-engine
 
   lila_fishnet:
-    build:
-      context: docker
-      dockerfile: lila-fishnet.Dockerfile
+    image: sbtscala/scala-sbt:eclipse-temurin-alpine-21.0.2_13_1.9.9_3.4.1
+    working_dir: /lila-fishnet
+    entrypoint: sbt app/run
     environment:
+      - APP_BACKUP_FILE=/backup.json
+      - CONFIG_FORCE_kamon_influxdb_authentication_token=secret
+      - CONFIG_FORCE_kamon_influxdb_hostname=influxdb
       - KAMON_ENABLED=${ENABLE_MONITORING:-false}
+      - REDIS_HOST=redis
       # - HTTP_API_LOGGER=true
     restart: unless-stopped
     networks:
@@ -214,9 +222,9 @@ services:
       - search
 
   lila_search:
-    build:
-      context: docker
-      dockerfile: lila-search.Dockerfile
+    image: sbtscala/scala-sbt:eclipse-temurin-alpine-21.0.2_13_1.9.9_2.13.13
+    working_dir: /lila-search
+    entrypoint: ["/bin/sh", "-c", "sbt stage && ./target/universal/stage/bin/lila-search"]
     restart: unless-stopped
     networks:
       - lila-network
@@ -227,9 +235,9 @@ services:
       - search
 
   lila_gif:
-    build:
-      context: docker
-      dockerfile: lila-gif.Dockerfile
+    image: rust:1.77.0-slim-bookworm
+    working_dir: /lila-gif
+    entrypoint: cargo run -- --bind 0.0.0.0:6175
     restart: unless-stopped
     ports:
       - 6175:6175
@@ -244,18 +252,18 @@ services:
     build:
       context: docker
       dockerfile: picfit.Dockerfile
-    restart: unless-stopped
     ports:
       - 3001:3001
     networks:
       - lila-network
     volumes:
       - ./conf/picfit.json:/mnt/config.json
+      - ./docker/assets:/uploads
     profiles:
       - thumbnails
 
   mailpit:
-    image: axllent/mailpit:v1.14.4
+    image: axllent/mailpit:v1.15.1
     restart: unless-stopped
     ports:
       - 8025:8025

diff --git a/docker/api-docs.Dockerfile b/docker/api-docs.Dockerfile
diff --git a/docker/chessground.Dockerfile b/docker/chessground.Dockerfile
diff --git a/docker/lila-engine.Dockerfile b/docker/lila-engine.Dockerfile
diff --git a/docker/lila-fishnet.Dockerfile b/docker/lila-fishnet.Dockerfile
diff --git a/docker/lila-gif.Dockerfile b/docker/lila-gif.Dockerfile
diff --git a/docker/lila-search.Dockerfile b/docker/lila-search.Dockerfile
diff --git a/docker/lila-ws.Dockerfile b/docker/lila-ws.Dockerfile
diff --git a/docker/lila.Dockerfile b/docker/lila.Dockerfile
diff --git a/docker/mobile.Dockerfile b/docker/mobile.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/cirruslabs/flutter:3.19.3
+FROM ghcr.io/cirruslabs/flutter:3.19.5
 
 RUN apt-get update && \
     apt-get install --yes clang cmake libgtk-3-dev ninja-build pkg-config && \
@@ -7,18 +7,9 @@ RUN apt-get update && \
 RUN dart --disable-analytics
 RUN flutter precache
 RUN sdkmanager \
-  "build-tools;30.0.3" \
+  "build-tools;34.0.0" \
   "emulator" \
-  "ndk;23.1.7779620" \
-  "platforms;android-29" \
-  "platforms;android-30" \
-  "platforms;android-31"
+  "ndk;26.2.11394342"
 RUN flutter doctor -v
 
-# Pre-install mobile app + Flutter dependencies
-RUN git clone --depth 1 https://github.com/lichess-org/mobile.git /opt/mobile && \
-    cd /opt/mobile && \
-    flutter pub get && \
-    dart run build_runner build
-
 WORKDIR /app
diff --git a/docker/pgn-viewer.Dockerfile b/docker/pgn-viewer.Dockerfile
diff --git a/docker/picfit.Dockerfile b/docker/picfit.Dockerfile
@@ -3,4 +3,4 @@ FROM carbrex/thoas-picfit:latest
 COPY assets/coach.png /uploads/coach.png
 COPY assets/streamer.png /uploads/streamer.png
 
-ENTRYPOINT ["/picfit", "-c", "/mnt/config.json"]
+ENTRYPOINT ["/picfit", "-c", "/mnt/config.json"]
diff --git a/docker/python.Dockerfile b/docker/python.Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.2_13-jdk-alpine
+FROM eclipse-temurin:22_36-jdk-alpine
 
 COPY --from=python:3.12.2-alpine3.19 / /
 

diff --git a/docker/ui.Dockerfile b/docker/ui.Dockerfile
@@ -9,3 +9,5 @@ RUN git config --global --add safe.directory /pgn-viewer
 RUN npm install -g pnpm
 
 RUN pnpm config set store-dir /.pnpm-store
+
+WORKDIR /app
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,5 @@ RUN git config --global --add safe.directory /pgn-viewer
		RUN npm install -g pnpm

		RUN pnpm config set store-dir /.pnpm-store

		WORKDIR /app