Merge branch 'develop'

2025-01-12 22:57:55 +03:00 · 2023-07-05 17:51:20 +03:00 · 2023-07-05 17:51:20 +03:00 · ba2a9622b7
commit ba2a9622b7
parent dbe0acb996 d0700d0568
54 changed files with 1078 additions and 1058 deletions
--- a/.github/workflows/epicmorg.ecosysctem.freegpt.images.yml
+++ b/.github/workflows/epicmorg.ecosysctem.freegpt.images.yml
@ -24,45 +24,28 @@ jobs:
      run:  make

    - name: Build and Deploy freegpt-webui 1.0
-      run:  cd linux/ecosystem/freegpt-webui/chat/1.0 && make build && make deploy
+      run:  cd linux/ecosystem/freegpt-webui/1.0 && make build && make deploy

    - name: Build and Deploy freegpt-webui 1.1
-      run:  cd linux/ecosystem/freegpt-webui/chat/1.1 && make build && make deploy
+      run:  cd linux/ecosystem/freegpt-webui/1.1 && make build && make deploy
      
    - name: Build and Deploy freegpt-webui 1.2
-      run:  cd linux/ecosystem/freegpt-webui/chat/1.2 && make build && make deploy
+      run:  cd linux/ecosystem/freegpt-webui/1.2 && make build && make deploy
      
    - name: Build and Deploy freegpt-webui 1.3
-      run:  cd linux/ecosystem/freegpt-webui/chat/1.3 && make build && make deploy
+      run:  cd linux/ecosystem/freegpt-webui/1.3 && make build && make deploy
      
    - name: Build and Deploy freegpt-webui 1.3.1
-      run:  cd linux/ecosystem/freegpt-webui/chat/1.3.1 && make build && make deploy
+      run:  cd linux/ecosystem/freegpt-webui/1.3.1 && make build && make deploy
      
    - name: Build and Deploy freegpt-webui 1.3.2
-      run:  cd linux/ecosystem/freegpt-webui/chat/1.3.2 && make build && make deploy
+      run:  cd linux/ecosystem/freegpt-webui/1.3.2 && make build && make deploy
      
    - name: Build and Deploy freegpt-webui 1.4
-      run:  cd linux/ecosystem/freegpt-webui/chat/1.4 && make build && make deploy
+      run:  cd linux/ecosystem/freegpt-webui/1.4 && make build && make deploy
      
    - name: Build and Deploy freegpt-webui latest
-      run:  cd linux/ecosystem/freegpt-webui/chat/latest && make build && make deploy
-
-##################################################################################
-
-    - name: Build and Deploy freegpt-webui endpoint 1.3
-      run:  cd linux/ecosystem/freegpt-webui/endpoint/1.3 && make build && make deploy
-      
-    - name: Build and Deploy freegpt-webui endpoint 1.3.1
-      run:  cd linux/ecosystem/freegpt-webui/endpoint/1.3.1 && make build && make deploy
-      
-    - name: Build and Deploy freegpt-webui endpoint 1.3.2
-      run:  cd linux/ecosystem/freegpt-webui/endpoint/1.3.2 && make build && make deploy
-      
-    - name: Build and Deploy freegpt-webui endpoint 1.4
-      run:  cd linux/ecosystem/freegpt-webui/endpoint/1.4 && make build && make deploy
-      
-    - name: Build and Deploy freegpt-webui endpoint latest
-      run:  cd linux/ecosystem/freegpt-webui/endpoint/latest && make build && make deploy
+      run:  cd linux/ecosystem/freegpt-webui/latest && make build && make deploy

 ##################################################################################
    - name: Cleanup
--- a/23
+++ b/23
@ -403,21 +403,14 @@ ecosystem-nodejs-images:
 	cd `pwd`/linux/ecosystem/nodejs/node20         && pwd && make build && make deploy

 ecosystem-freegpt-webui-images: 
-	cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.0     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.1     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.2     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.3     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.3.1     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.3.2     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.4     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/chat/latest     && pwd && make build && make deploy
-
-	cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/1.3     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/1.3.1     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/1.3.2     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/1.4     && pwd && make build && make deploy
-	cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/latest     && pwd && make build && make deploy
-
+	cd `pwd`/linux/ecosystem/freegpt-webui/1.0     && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/freegpt-webui/1.1     && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/freegpt-webui/1.2     && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/freegpt-webui/1.3     && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/freegpt-webui/1.3.1     && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/freegpt-webui/1.3.2     && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/freegpt-webui/1.4     && pwd && make build && make deploy
+	cd `pwd`/linux/ecosystem/freegpt-webui/latest     && pwd && make build && make deploy

 ecosystem-vk2discord-images: 
 	cd `pwd`/linux/ecosystem/vk2discord     && pwd && make build && make deploy
--- a/linux/ecosystem/freegpt-webui/chat/1.0/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/chat/1.0/Dockerfile
@ -11,8 +11,6 @@ ARG FREEGPT_VERSION=1.0

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH

 RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
    rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +22,8 @@ RUN apt-get update && \
      libcurl4-openssl-dev && \  
    pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt   

+RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
+
 ##################################################################
 ##################################################################
 ##################################################################
@ -35,16 +35,23 @@ FROM epicmorg/python:3.10 AS production

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH

-RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
+RUN mkdir -p ${FREEGPT_PATH}
+
+##################################################################
+#                   Setup supervisord
+##################################################################
+RUN apt-get update && \
+    apt-get install -y \
+      supervisor
+
+COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf

 ##################################################################
 #                   Copy bins
 ##################################################################
-COPY --from=build /root/.local /root/.local
-COPY --from=build /app /app
+COPY --from=build /root/.local /usr/local
+COPY --from=build /app ${FREEGPT_PATH}

 ##################################################################
 #                   cleaninig up
@ -59,4 +66,4 @@ RUN apt clean -y && \
 WORKDIR ${FREEGPT_PATH}   
 EXPOSE  ${FREEGPT_PORT}  

-CMD ["python3", "./run.py"]
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]
--- a/linux/ecosystem/freegpt-webui/chat/1.0/Makefile
+++ b/linux/ecosystem/freegpt-webui/chat/1.0/Makefile
--- a/linux/ecosystem/freegpt-webui/chat/1.0/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/chat/1.0/docker-compose.yml
--- a/linux/ecosystem/freegpt-webui/1.0/etc/supervisor/conf.d/freegpt.conf
+++ b/linux/ecosystem/freegpt-webui/1.0/etc/supervisor/conf.d/freegpt.conf
@ -0,0 +1,29 @@
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+username = freegpt
+password = freegpt
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+nodaemon=true
+user=root
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+username = freegpt
+password = freegpt
+
+[program:freegpt-webui]
+command=/usr/local/bin/python3.10 /app/run.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=666
+startsecs=5
--- a/linux/ecosystem/freegpt-webui/chat/1.1/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/chat/1.1/Dockerfile
@ -11,8 +11,6 @@ ARG FREEGPT_VERSION=1.1

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH

 RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
    rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +22,8 @@ RUN apt-get update && \
      libcurl4-openssl-dev && \  
    pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt

+RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
+
 ##################################################################
 ##################################################################
 ##################################################################
@ -35,16 +35,23 @@ FROM epicmorg/python:3.10 AS production

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH

-RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
+RUN mkdir -p ${FREEGPT_PATH}
+
+##################################################################
+#                   Setup supervisord
+##################################################################
+RUN apt-get update && \
+    apt-get install -y \
+      supervisor
+
+COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf

 ##################################################################
 #                   Copy bins
 ##################################################################
-COPY --from=build /root/.local /root/.local
-COPY --from=build /app /app
+COPY --from=build /root/.local /usr/local
+COPY --from=build /app ${FREEGPT_PATH}

 ##################################################################
 #                   cleaninig up
@ -59,4 +66,4 @@ RUN apt clean -y && \
 WORKDIR ${FREEGPT_PATH}   
 EXPOSE  ${FREEGPT_PORT}  

-CMD ["python3", "./run.py"]
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]
--- a/linux/ecosystem/freegpt-webui/chat/1.1/Makefile
+++ b/linux/ecosystem/freegpt-webui/chat/1.1/Makefile
--- a/linux/ecosystem/freegpt-webui/chat/1.1/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/chat/1.1/docker-compose.yml
--- a/linux/ecosystem/freegpt-webui/1.1/etc/supervisor/conf.d/freegpt.conf
+++ b/linux/ecosystem/freegpt-webui/1.1/etc/supervisor/conf.d/freegpt.conf
@ -0,0 +1,29 @@
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+username = freegpt
+password = freegpt
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+nodaemon=true
+user=root
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+username = freegpt
+password = freegpt
+
+[program:freegpt-webui]
+command=/usr/local/bin/python3.10 /app/run.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=666
+startsecs=5
--- a/linux/ecosystem/freegpt-webui/chat/1.2/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/chat/1.2/Dockerfile
@ -11,8 +11,6 @@ ARG FREEGPT_VERSION=1.2

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH

 RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
    rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +22,8 @@ RUN apt-get update && \
      libcurl4-openssl-dev && \  
    pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt

+RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
+
 ##################################################################
 ##################################################################
 ##################################################################
@ -35,16 +35,23 @@ FROM epicmorg/python:3.10 AS production

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH

-RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
+RUN mkdir -p ${FREEGPT_PATH}
+
+##################################################################
+#                   Setup supervisord
+##################################################################
+RUN apt-get update && \
+    apt-get install -y \
+      supervisor
+
+COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf

 ##################################################################
 #                   Copy bins
 ##################################################################
-COPY --from=build /root/.local /root/.local
-COPY --from=build /app /app
+COPY --from=build /root/.local /usr/local
+COPY --from=build /app ${FREEGPT_PATH}

 ##################################################################
 #                   cleaninig up
@ -59,4 +66,4 @@ RUN apt clean -y && \
 WORKDIR ${FREEGPT_PATH}   
 EXPOSE  ${FREEGPT_PORT}  

-CMD ["python3", "./run.py"]
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]
--- a/linux/ecosystem/freegpt-webui/chat/1.2/Makefile
+++ b/linux/ecosystem/freegpt-webui/chat/1.2/Makefile
--- a/linux/ecosystem/freegpt-webui/chat/1.2/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/chat/1.2/docker-compose.yml
--- a/linux/ecosystem/freegpt-webui/1.2/etc/supervisor/conf.d/freegpt.conf
+++ b/linux/ecosystem/freegpt-webui/1.2/etc/supervisor/conf.d/freegpt.conf
@ -0,0 +1,29 @@
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+username = freegpt
+password = freegpt
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+nodaemon=true
+user=root
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+username = freegpt
+password = freegpt
+
+[program:freegpt-webui]
+command=/usr/local/bin/python3.10 /app/run.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=666
+startsecs=5
--- a/linux/ecosystem/freegpt-webui/chat/1.3.1/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/chat/1.3.1/Dockerfile
@ -11,8 +11,7 @@ ARG FREEGPT_VERSION=1.3.1

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

 RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
    rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +23,8 @@ RUN apt-get update && \
      libcurl4-openssl-dev && \  
    pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt

+RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
+
 ##################################################################
 ##################################################################
 ##################################################################
@ -35,16 +36,24 @@ FROM epicmorg/python:3.10 AS production

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

-RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
+RUN mkdir -p ${FREEGPT_PATH}
+
+##################################################################
+#                   Setup supervisord
+##################################################################
+RUN apt-get update && \
+    apt-get install -y \
+      supervisor
+
+COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf

 ##################################################################
 #                   Copy bins
 ##################################################################
-COPY --from=build /root/.local /root/.local
-COPY --from=build /app /app
+COPY --from=build /root/.local /usr/local
+COPY --from=build /app ${FREEGPT_PATH}

 ##################################################################
 #                   cleaninig up
@ -57,6 +66,6 @@ RUN apt clean -y && \
    rm -rfv /tmp/*

 WORKDIR ${FREEGPT_PATH}   
-EXPOSE  ${FREEGPT_PORT}  
+EXPOSE  ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}

-CMD ["python3", "./run.py"]
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]
--- a/linux/ecosystem/freegpt-webui/chat/1.3.1/Makefile
+++ b/linux/ecosystem/freegpt-webui/chat/1.3.1/Makefile
--- a/linux/ecosystem/freegpt-webui/chat/1.3.1/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/chat/1.3.1/docker-compose.yml
--- a/linux/ecosystem/freegpt-webui/1.3.1/etc/supervisor/conf.d/freegpt.conf
+++ b/linux/ecosystem/freegpt-webui/1.3.1/etc/supervisor/conf.d/freegpt.conf
@ -0,0 +1,38 @@
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+username = freegpt
+password = freegpt
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+nodaemon=true
+user=root
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+username = freegpt
+password = freegpt
+
+[program:freegpt-webui]
+command=/usr/local/bin/python3.10 /app/run.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=666
+startsecs=5
+
+[program:freegpt-endpoint]
+command=/usr/local/bin/python3.10 /app/endpoint.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=777
+startsecs=7
--- a/linux/ecosystem/freegpt-webui/chat/1.3.2/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/chat/1.3.2/Dockerfile
@ -11,8 +11,7 @@ ARG FREEGPT_VERSION=1.3.2

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

 RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
    rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +23,8 @@ RUN apt-get update && \
      libcurl4-openssl-dev && \  
    pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements-docker.txt   

+RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
+
 ##################################################################
 ##################################################################
 ##################################################################
@ -35,16 +36,24 @@ FROM epicmorg/python:3.10 AS production

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

-RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
+RUN mkdir -p ${FREEGPT_PATH}
+
+##################################################################
+#                   Setup supervisord
+##################################################################
+RUN apt-get update && \
+    apt-get install -y \
+      supervisor
+
+COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf

 ##################################################################
 #                   Copy bins
 ##################################################################
-COPY --from=build /root/.local /root/.local
-COPY --from=build /app /app
+COPY --from=build /root/.local /usr/local
+COPY --from=build /app ${FREEGPT_PATH}

 ##################################################################
 #                   cleaninig up
@ -57,6 +66,6 @@ RUN apt clean -y && \
    rm -rfv /tmp/*

 WORKDIR ${FREEGPT_PATH}   
-EXPOSE  ${FREEGPT_PORT}  
+EXPOSE  ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}

-CMD ["python3", "./run.py"]
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]
--- a/linux/ecosystem/freegpt-webui/chat/1.3.2/Makefile
+++ b/linux/ecosystem/freegpt-webui/chat/1.3.2/Makefile
--- a/linux/ecosystem/freegpt-webui/chat/1.3.2/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/chat/1.3.2/docker-compose.yml
--- a/linux/ecosystem/freegpt-webui/1.3.2/etc/supervisor/conf.d/freegpt.conf
+++ b/linux/ecosystem/freegpt-webui/1.3.2/etc/supervisor/conf.d/freegpt.conf
@ -0,0 +1,38 @@
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+username = freegpt
+password = freegpt
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+nodaemon=true
+user=root
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+username = freegpt
+password = freegpt
+
+[program:freegpt-webui]
+command=/usr/local/bin/python3.10 /app/run.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=666
+startsecs=5
+
+[program:freegpt-endpoint]
+command=/usr/local/bin/python3.10 /app/endpoint.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=777
+startsecs=7
--- a/linux/ecosystem/freegpt-webui/chat/1.3/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/chat/1.3/Dockerfile
@ -11,8 +11,7 @@ ARG FREEGPT_VERSION=1.3

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

 RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
    rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +23,8 @@ RUN apt-get update && \
      libcurl4-openssl-dev && \  
    pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt  

+RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
+
 ##################################################################
 ##################################################################
 ##################################################################
@ -35,16 +36,24 @@ FROM epicmorg/python:3.10 AS production

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

-RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
+RUN mkdir -p ${FREEGPT_PATH}
+
+##################################################################
+#                   Setup supervisord
+##################################################################
+RUN apt-get update && \
+    apt-get install -y \
+      supervisor
+
+COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf

 ##################################################################
 #                   Copy bins
 ##################################################################
-COPY --from=build /root/.local /root/.local
-COPY --from=build /app /app
+COPY --from=build /root/.local /usr/local
+COPY --from=build /app ${FREEGPT_PATH}

 ##################################################################
 #                   cleaninig up
@ -57,6 +66,6 @@ RUN apt clean -y && \
    rm -rfv /tmp/*

 WORKDIR ${FREEGPT_PATH}   
-EXPOSE  ${FREEGPT_PORT}  
+EXPOSE  ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}

-CMD ["python3", "./run.py"]
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]
--- a/linux/ecosystem/freegpt-webui/chat/1.3/Makefile
+++ b/linux/ecosystem/freegpt-webui/chat/1.3/Makefile
--- a/linux/ecosystem/freegpt-webui/chat/1.3/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/chat/1.3/docker-compose.yml
--- a/linux/ecosystem/freegpt-webui/1.3/etc/supervisor/conf.d/freegpt.conf
+++ b/linux/ecosystem/freegpt-webui/1.3/etc/supervisor/conf.d/freegpt.conf
@ -0,0 +1,38 @@
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+username = freegpt
+password = freegpt
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+nodaemon=true
+user=root
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+username = freegpt
+password = freegpt
+
+[program:freegpt-webui]
+command=/usr/local/bin/python3.10 /app/run.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=666
+startsecs=5
+
+[program:freegpt-endpoint]
+command=/usr/local/bin/python3.10 /app/endpoint.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=777
+startsecs=7
--- a/linux/ecosystem/freegpt-webui/chat/1.4/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/chat/1.4/Dockerfile
@ -11,8 +11,7 @@ ARG FREEGPT_VERSION=1.4

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

 RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
    rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +23,8 @@ RUN apt-get update && \
      libcurl4-openssl-dev && \  
    pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements-docker.txt   

+RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
+
 ##################################################################
 ##################################################################
 ##################################################################
@ -35,16 +36,24 @@ FROM epicmorg/python:3.10 AS production

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

-RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
+RUN mkdir -p ${FREEGPT_PATH}
+
+##################################################################
+#                   Setup supervisord
+##################################################################
+RUN apt-get update && \
+    apt-get install -y \
+      supervisor
+
+COPY etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf

 ##################################################################
 #                   Copy bins
 ##################################################################
-COPY --from=build /root/.local /root/.local
-COPY --from=build /app /app
+COPY --from=build /root/.local /usr/local
+COPY --from=build /app ${FREEGPT_PATH}

 ##################################################################
 #                   cleaninig up
@ -57,6 +66,6 @@ RUN apt clean -y && \
    rm -rfv /tmp/*

 WORKDIR ${FREEGPT_PATH}   
-EXPOSE  ${FREEGPT_PORT}  
+EXPOSE  ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}

-CMD ["python3", "./run.py"]
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]
--- a/linux/ecosystem/freegpt-webui/chat/1.4/Makefile
+++ b/linux/ecosystem/freegpt-webui/chat/1.4/Makefile
--- a/linux/ecosystem/freegpt-webui/chat/1.4/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/chat/1.4/docker-compose.yml
--- a/linux/ecosystem/freegpt-webui/1.4/etc/supervisor/conf.d/freegpt.conf
+++ b/linux/ecosystem/freegpt-webui/1.4/etc/supervisor/conf.d/freegpt.conf
@ -0,0 +1,38 @@
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+username = freegpt
+password = freegpt
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+nodaemon=true
+user=root
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+username = freegpt
+password = freegpt
+
+[program:freegpt-webui]
+command=/usr/local/bin/python3.10 /app/run.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=666
+startsecs=5
+
+[program:freegpt-endpoint]
+command=/usr/local/bin/python3.10 /app/endpoint.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=777
+startsecs=7
--- a/linux/ecosystem/freegpt-webui/README.md
+++ b/linux/ecosystem/freegpt-webui/README.md
@ -3,32 +3,21 @@
 * Improved docker images.
 * Original repo here: [Em1tSan/freegpt-webui-ru](https://github.com/Em1tSan/freegpt-webui-ru)

-## Ready docker-compose example
+* All versions now running by `supervisord` instead of direct `CMD python3 ./run.py`
+* Since `v1.3+` image contain **both** applications in background - `webui` chat (via port `1338`) and `endpoint` api (via port `1337`).

-### Normal WebUI (All versions)
+# Ready docker-compose example

 ```yml
 version: "3.9"
 services:
  freegpt-webui:
-    image: epicmorg/freegpt-webui:latest #1.3.2, 1.3.1, etc
-    container_name: freegpt-webui
-    hostname: freegpt-webui
-    restart: always
-    ports:
-       - 1338:1338
-```
-
-### Endpoint API (v1.3+ only)
-
-```yml
-version: "3.9"
-services:
-  freegpt-webui:
-    image: epicmorg/freegpt-webui:latest-endpoint # 1.3, 1.3.1, 1.3.2, 1.4, etc
+    image: epicmorg/freegpt-webui:latest #1.3.2, <...>, 1.0, etc
    container_name: freegpt-webui
    hostname: freegpt-webui
    restart: always
    ports:
       - 1337:1337
+       - 1338:1338
 ```
+
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3.1/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3.1/Dockerfile
@ -1,11 +0,0 @@
-##################################################################
-##################################################################
-##################################################################
-#                     Production stage   
-##################################################################
-##################################################################
-##################################################################
-FROM epicmorg/freegpt-webui:1.3.1 AS production    
-
-ENV FREEGPT_PORT=1337
-CMD ["python3", "./endpoint.py"]
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3.1/Makefile
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3.1/Makefile
@ -1,19 +0,0 @@
-all: app
-
-app:
-	make build
-	make deploy
-	make clean
-
-build:
-	docker-compose build --compress --no-cache  --progress plain
-
-deploy:
-	docker-compose push
-
-clean:
-	docker container prune -f
-	docker image prune -f
-	docker network prune -f
-	docker volume prune -f
-	docker system prune -af
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3.1/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3.1/docker-compose.yml
@ -1,6 +0,0 @@
-version: '3.9'
-services:
-  app:
-    image: "epicmorg/freegpt-webui:1.3.1-endpoint"
-    build:
-      context: .
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3.2/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3.2/Dockerfile
@ -1,11 +0,0 @@
-##################################################################
-##################################################################
-##################################################################
-#                     Production stage   
-##################################################################
-##################################################################
-##################################################################
-FROM epicmorg/freegpt-webui:1.3.2 AS production    
-
-ENV FREEGPT_PORT=1337
-CMD ["python3", "./endpoint.py"]
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3.2/Makefile
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3.2/Makefile
@ -1,19 +0,0 @@
-all: app
-
-app:
-	make build
-	make deploy
-	make clean
-
-build:
-	docker-compose build --compress --no-cache  --progress plain
-
-deploy:
-	docker-compose push
-
-clean:
-	docker container prune -f
-	docker image prune -f
-	docker network prune -f
-	docker volume prune -f
-	docker system prune -af
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3.2/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3.2/docker-compose.yml
@ -1,6 +0,0 @@
-version: '3.9'
-services:
-  app:
-    image: "epicmorg/freegpt-webui:1.3.2-endpoint"
-    build:
-      context: .
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3/Dockerfile
@ -1,11 +0,0 @@
-##################################################################
-##################################################################
-##################################################################
-#                     Production stage   
-##################################################################
-##################################################################
-##################################################################
-FROM epicmorg/freegpt-webui:1.3 AS production    
-
-ENV FREEGPT_PORT=1337
-CMD ["python3", "./endpoint.py"]
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3/Makefile
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3/Makefile
@ -1,19 +0,0 @@
-all: app
-
-app:
-	make build
-	make deploy
-	make clean
-
-build:
-	docker-compose build --compress --no-cache  --progress plain
-
-deploy:
-	docker-compose push
-
-clean:
-	docker container prune -f
-	docker image prune -f
-	docker network prune -f
-	docker volume prune -f
-	docker system prune -af
--- a/linux/ecosystem/freegpt-webui/endpoint/1.3/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.3/docker-compose.yml
@ -1,6 +0,0 @@
-version: '3.9'
-services:
-  app:
-    image: "epicmorg/freegpt-webui:1.3-endpoint"
-    build:
-      context: .
--- a/linux/ecosystem/freegpt-webui/endpoint/1.4/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.4/Dockerfile
@ -1,11 +0,0 @@
-##################################################################
-##################################################################
-##################################################################
-#                     Production stage   
-##################################################################
-##################################################################
-##################################################################
-FROM epicmorg/freegpt-webui:1.4 AS production    
-
-ENV FREEGPT_PORT=1337
-CMD ["python3", "./endpoint.py"]
--- a/linux/ecosystem/freegpt-webui/endpoint/1.4/Makefile
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.4/Makefile
@ -1,19 +0,0 @@
-all: app
-
-app:
-	make build
-	make deploy
-	make clean
-
-build:
-	docker-compose build --compress --no-cache  --progress plain
-
-deploy:
-	docker-compose push
-
-clean:
-	docker container prune -f
-	docker image prune -f
-	docker network prune -f
-	docker volume prune -f
-	docker system prune -af
--- a/linux/ecosystem/freegpt-webui/endpoint/1.4/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/endpoint/1.4/docker-compose.yml
@ -1,6 +0,0 @@
-version: '3.9'
-services:
-  app:
-    image: "epicmorg/freegpt-webui:1.4-endpoint"
-    build:
-      context: .
--- a/linux/ecosystem/freegpt-webui/endpoint/latest/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/endpoint/latest/Dockerfile
@ -1,11 +0,0 @@
-##################################################################
-##################################################################
-##################################################################
-#                     Production stage   
-##################################################################
-##################################################################
-##################################################################
-FROM epicmorg/freegpt-webui:latest AS production    
-
-ENV FREEGPT_PORT=1337
-CMD ["python3", "./endpoint.py"]
--- a/linux/ecosystem/freegpt-webui/endpoint/latest/Makefile
+++ b/linux/ecosystem/freegpt-webui/endpoint/latest/Makefile
@ -1,19 +0,0 @@
-all: app
-
-app:
-	make build
-	make deploy
-	make clean
-
-build:
-	docker-compose build --compress --no-cache  --progress plain
-
-deploy:
-	docker-compose push
-
-clean:
-	docker container prune -f
-	docker image prune -f
-	docker network prune -f
-	docker volume prune -f
-	docker system prune -af
--- a/linux/ecosystem/freegpt-webui/endpoint/latest/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/endpoint/latest/docker-compose.yml
@ -1,6 +0,0 @@
-version: '3.9'
-services:
-  app:
-    image: "epicmorg/freegpt-webui:latest-endpoint"
-    build:
-      context: .
--- a/linux/ecosystem/freegpt-webui/chat/latest/Dockerfile
+++ b/linux/ecosystem/freegpt-webui/chat/latest/Dockerfile
@ -9,8 +9,7 @@ FROM epicmorg/python:3.10-develop AS build

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

 RUN git clone https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
    rm -rfv ${FREEGPT_PATH}/.git
@ -22,6 +21,8 @@ RUN apt-get update && \
      libcurl4-openssl-dev && \  
    pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements-docker.txt   

+RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
+
 ##################################################################
 ##################################################################
 ##################################################################
@ -33,16 +34,24 @@ FROM epicmorg/python:3.10 AS production

 ENV FREEGPT_PATH=/app
 ENV FREEGPT_PORT=1338
-ENV FREEGTP_PY_BIN=/root/.local/bin
-ENV PATH=/root/.local/bin:$PATH
+ENV FREEGPT_ENDPOINT_PORT=1337

-RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
+RUN mkdir -p ${FREEGPT_PATH}
+
+##################################################################
+#                   Setup supervisord
+##################################################################
+RUN apt-get update && \
+    apt-get install -y \
+      supervisor
+
+COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf

 ##################################################################
 #                   Copy bins
 ##################################################################
-COPY --from=build /root/.local /root/.local
-COPY --from=build /app /app
+COPY --from=build /root/.local /usr/local
+COPY --from=build /app ${FREEGPT_PATH}

 ##################################################################
 #                   cleaninig up
@ -55,6 +64,6 @@ RUN apt clean -y && \
    rm -rfv /tmp/*

 WORKDIR ${FREEGPT_PATH}   
-EXPOSE  ${FREEGPT_PORT}  
+EXPOSE  ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}

-CMD ["python3", "./run.py"]
+CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]
--- a/linux/ecosystem/freegpt-webui/chat/latest/Makefile
+++ b/linux/ecosystem/freegpt-webui/chat/latest/Makefile
--- a/linux/ecosystem/freegpt-webui/chat/latest/docker-compose.yml
+++ b/linux/ecosystem/freegpt-webui/chat/latest/docker-compose.yml
--- a/linux/ecosystem/freegpt-webui/latest/etc/supervisor/conf.d/freegpt.conf
+++ b/linux/ecosystem/freegpt-webui/latest/etc/supervisor/conf.d/freegpt.conf
@ -0,0 +1,38 @@
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+username = freegpt
+password = freegpt
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+nodaemon=true
+user=root
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+username = freegpt
+password = freegpt
+
+[program:freegpt-webui]
+command=/usr/local/bin/python3.10 /app/run.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=666
+startsecs=5
+
+[program:freegpt-endpoint]
+command=/usr/local/bin/python3.10 /app/endpoint.py
+directory=/app
+user=root
+autostart=true
+autorestart=unexpected
+priority=777
+startsecs=7
--- a/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk11/Dockerfile
@ -52,95 +52,88 @@ RUN apt update && \

 # Install ALL ANDROID SDK
 RUN sdkmanager --install \
+      "build-tools;17.0.0" \
+      "build-tools;18.0.0" \
+      "build-tools;18.0.1" \
+      "build-tools;18.1.0" \
+      "build-tools;18.1.1" \
+      "build-tools;19.0.0" \
+      "build-tools;19.0.1" \
+      "build-tools;19.0.2" \
+      "build-tools;19.0.3" \
+      "build-tools;19.1.0" \
+      "build-tools;20.0.0" \
+      "build-tools;21.0.0" \
+      "build-tools;21.0.1" \
+      "build-tools;21.0.2" \
+      "build-tools;21.1.0" \
+      "build-tools;21.1.1" \
+      "build-tools;21.1.2" \
+      "build-tools;22.0.0" \
+      "build-tools;22.0.1" \
+      "build-tools;23.0.0" \
+      "build-tools;23.0.1" \
+      "build-tools;23.0.2" \
+      "build-tools;23.0.3" \
+      "build-tools;24.0.0" \
+      "build-tools;24.0.1" \
+      "build-tools;24.0.2" \
+      "build-tools;24.0.3" \
+      "build-tools;25.0.0" \
+      "build-tools;25.0.1" \
+      "build-tools;25.0.2" \
+      "build-tools;25.0.3" \
+      "build-tools;26.0.0" \
+      "build-tools;26.0.0-rc1" \
+      "build-tools;26.0.0-rc2" \
+      "build-tools;26.0.1" \
+      "build-tools;26.0.2" \
+      "build-tools;26.0.3" \
+      "build-tools;27.0.0" \
+      "build-tools;27.0.1" \
+      "build-tools;27.0.2" \
+      "build-tools;27.0.3" \
+      "build-tools;28.0.0" \
+      "build-tools;28.0.0-rc1" \
+      "build-tools;28.0.0-rc2" \
+      "build-tools;28.0.1" \
+      "build-tools;28.0.2" \
      "build-tools;28.0.3" \
+      "build-tools;29.0.0" \
+      "build-tools;29.0.0-rc1" \
+      "build-tools;29.0.0-rc2" \
+      "build-tools;29.0.0-rc3" \
+      "build-tools;29.0.1" \
+      "build-tools;29.0.2" \
      "build-tools;29.0.3" \
+      "build-tools;30.0.0" \
+      "build-tools;30.0.0-rc1" \
+      "build-tools;30.0.0-rc2" \
+      "build-tools;30.0.0-rc3" \
+      "build-tools;30.0.0-rc4" \
+      "build-tools;30.0.1" \
+      "build-tools;30.0.2" \
      "build-tools;30.0.3" \
      "build-tools;31.0.0" \
+      "build-tools;31.0.0-rc1" \
+      "build-tools;31.0.0-rc2" \
+      "build-tools;31.0.0-rc3" \
+      "build-tools;31.0.0-rc4" \
+      "build-tools;31.0.0-rc5" \
      "build-tools;32.0.0" \
+      "build-tools;32.1.0-rc1" \
+      "build-tools;33.0.0" \
+      "build-tools;33.0.0-rc1" \
+      "build-tools;33.0.0-rc2" \
+      "build-tools;33.0.0-rc3" \
+      "build-tools;33.0.0-rc4" \
+      "build-tools;33.0.1" \
      "build-tools;33.0.2" \
-      "build-tools;34.0.0"
-#      "build-tools;17.0.0" \
-#      "build-tools;18.0.0" \
-#      "build-tools;18.0.1" \
-#      "build-tools;18.1.0" \
-#      "build-tools;18.1.1" \
-#      "build-tools;19.0.0" \
-#      "build-tools;19.0.1" \
-#      "build-tools;19.0.2" \
-#      "build-tools;19.0.3" \
-#      "build-tools;19.1.0" \
-#      "build-tools;20.0.0" \
-#      "build-tools;21.0.0" \
-#      "build-tools;21.0.1" \
-#      "build-tools;21.0.2" \
-#      "build-tools;21.1.0" \
-#      "build-tools;21.1.1" \
-#      "build-tools;21.1.2" \
-#      "build-tools;22.0.0" \
-#      "build-tools;22.0.1" \
-#      "build-tools;23.0.0" \
-#      "build-tools;23.0.1" \
-#      "build-tools;23.0.2" \
-#      "build-tools;23.0.3" \
-#      "build-tools;24.0.0" \
-#      "build-tools;24.0.1" \
-#      "build-tools;24.0.2" \
-#      "build-tools;24.0.3" \
-#      "build-tools;25.0.0" \
-#      "build-tools;25.0.1" \
-#      "build-tools;25.0.2" \
-#      "build-tools;25.0.3" \
-#      "build-tools;26.0.0" \
-#      "build-tools;26.0.0-rc1" \
-#      "build-tools;26.0.0-rc2" \
-#      "build-tools;26.0.1" \
-#      "build-tools;26.0.2" \
-#      "build-tools;26.0.3" \
-#      "build-tools;27.0.0" \
-#      "build-tools;27.0.1" \
-#      "build-tools;27.0.2" \
-#      "build-tools;27.0.3" \
-#      "build-tools;28.0.0" \
-#      "build-tools;28.0.0-rc1" \
-#      "build-tools;28.0.0-rc2" \
-#      "build-tools;28.0.1" \
-#      "build-tools;28.0.2" \
-#     "build-tools;28.0.3" \
-#      "build-tools;29.0.0" \
-#      "build-tools;29.0.0-rc1" \
-#      "build-tools;29.0.0-rc2" \
-#      "build-tools;29.0.0-rc3" \
-#      "build-tools;29.0.1" \
-#      "build-tools;29.0.2" \
-#     "build-tools;29.0.3" \
-#     "build-tools;30.0.0" \
-#     "build-tools;30.0.0-rc1" \
-#     "build-tools;30.0.0-rc2" \
-#     "build-tools;30.0.0-rc3" \
-#     "build-tools;30.0.0-rc4" \
-#     "build-tools;30.0.1" \
-#     "build-tools;30.0.2" \
-#     "build-tools;30.0.3" \
-#     "build-tools;31.0.0" \
-#     "build-tools;31.0.0-rc1" \
-#     "build-tools;31.0.0-rc2" \
-#     "build-tools;31.0.0-rc3" \
-#     "build-tools;31.0.0-rc4" \
-#     "build-tools;31.0.0-rc5" \
-#     "build-tools;32.0.0" \
-#     "build-tools;32.1.0-rc1" \
-#     "build-tools;33.0.0" \
-#     "build-tools;33.0.0-rc1" \
-#     "build-tools;33.0.0-rc2" \
-#     "build-tools;33.0.0-rc3" \
-#     "build-tools;33.0.0-rc4" \
-#     "build-tools;33.0.1" \
-#     "build-tools;33.0.2" \
-#     "build-tools;34.0.0" \
-#     "build-tools;34.0.0-rc1" \
-#     "build-tools;34.0.0-rc2" \
-#     "build-tools;34.0.0-rc3" \
-#     "build-tools;34.0.0-rc4"
+      "build-tools;34.0.0" \
+      "build-tools;34.0.0-rc1" \
+      "build-tools;34.0.0-rc2" \
+      "build-tools;34.0.0-rc3" \
+      "build-tools;34.0.0-rc4"


 RUN sdkmanager --install \
@ -172,6 +165,48 @@ RUN sdkmanager --install \

 RUN sdkmanager --install \
      "extras;android;m2repository" \
+      "extras;android;m2repository;01" \
+      "extras;android;m2repository;02" \
+      "extras;android;m2repository;03" \
+      "extras;android;m2repository;04" \
+      "extras;android;m2repository;06" \
+      "extras;android;m2repository;07" \
+      "extras;android;m2repository;08" \
+      "extras;android;m2repository;09" \
+      "extras;android;m2repository;1" \
+      "extras;android;m2repository;10" \
+      "extras;android;m2repository;11" \
+      "extras;android;m2repository;12" \
+      "extras;android;m2repository;13" \
+      "extras;android;m2repository;14" \
+      "extras;android;m2repository;15" \
+      "extras;android;m2repository;16" \
+      "extras;android;m2repository;17" \
+      "extras;android;m2repository;18" \
+      "extras;android;m2repository;19" \
+      "extras;android;m2repository;2" \
+      "extras;android;m2repository;20" \
+      "extras;android;m2repository;21" \
+      "extras;android;m2repository;22" \
+      "extras;android;m2repository;23" \
+      "extras;android;m2repository;24" \
+      "extras;android;m2repository;25" \
+      "extras;android;m2repository;26" \
+      "extras;android;m2repository;27" \
+      "extras;android;m2repository;28" \
+      "extras;android;m2repository;29" \
+      "extras;android;m2repository;3" \
+      "extras;android;m2repository;30" \
+      "extras;android;m2repository;31" \
+      "extras;android;m2repository;32" \
+      "extras;android;m2repository;33" \
+      "extras;android;m2repository;34" \
+      "extras;android;m2repository;35" \
+      "extras;android;m2repository;36" \
+      "extras;android;m2repository;37" \
+      "extras;android;m2repository;38" \
+      "extras;android;m2repository;39" \
+      "extras;android;m2repository;4" \
      "extras;android;m2repository;40" \
      "extras;android;m2repository;41" \
      "extras;android;m2repository;42" \
@ -179,62 +214,11 @@ RUN sdkmanager --install \
      "extras;android;m2repository;44" \
      "extras;android;m2repository;45" \
      "extras;android;m2repository;46" \
-      "extras;android;m2repository;47"
-#      "extras;android;m2repository" \
-#      "extras;android;m2repository;01" \
-#      "extras;android;m2repository;02" \
-#      "extras;android;m2repository;03" \
-#      "extras;android;m2repository;04" \
-#      "extras;android;m2repository;06" \
-#      "extras;android;m2repository;07" \
-#      "extras;android;m2repository;08" \
-#      "extras;android;m2repository;09" \
-#      "extras;android;m2repository;1" \
-#      "extras;android;m2repository;10" \
-#      "extras;android;m2repository;11" \
-#      "extras;android;m2repository;12" \
-#      "extras;android;m2repository;13" \
-#      "extras;android;m2repository;14" \
-#      "extras;android;m2repository;15" \
-#      "extras;android;m2repository;16" \
-#      "extras;android;m2repository;17" \
-#      "extras;android;m2repository;18" \
-#      "extras;android;m2repository;19" \
-#      "extras;android;m2repository;2" \
-#      "extras;android;m2repository;20" \
-#      "extras;android;m2repository;21" \
-#      "extras;android;m2repository;22" \
-#      "extras;android;m2repository;23" \
-#      "extras;android;m2repository;24" \
-#      "extras;android;m2repository;25" \
-#      "extras;android;m2repository;26" \
-#      "extras;android;m2repository;27" \
-#      "extras;android;m2repository;28" \
-#      "extras;android;m2repository;29" \
-#      "extras;android;m2repository;3" \
-#      "extras;android;m2repository;30" \
-#      "extras;android;m2repository;31" \
-#      "extras;android;m2repository;32" \
-#      "extras;android;m2repository;33" \
-#      "extras;android;m2repository;34" \
-#      "extras;android;m2repository;35" \
-#      "extras;android;m2repository;36" \
-#      "extras;android;m2repository;37" \
-#      "extras;android;m2repository;38" \
-#      "extras;android;m2repository;39" \
-#      "extras;android;m2repository;4" \
-#      "extras;android;m2repository;40" \
-#      "extras;android;m2repository;41" \
-#      "extras;android;m2repository;42" \
-#      "extras;android;m2repository;43" \
-#      "extras;android;m2repository;44" \
-#      "extras;android;m2repository;45" \
-#      "extras;android;m2repository;46" \
-#      "extras;android;m2repository;47" \
-#      "extras;android;m2repository;6" \
-#      "extras;android;m2repository;7" \
-#      "extras;android;m2repository;8" \
-#      "extras;android;m2repository;9"
+      "extras;android;m2repository;47" \
+      "extras;android;m2repository;6" \
+      "extras;android;m2repository;7" \
+      "extras;android;m2repository;8" \
+      "extras;android;m2repository;9"

 RUN sdkmanager --install \
      "platform-tools" \
@ -261,48 +245,40 @@ RUN sdkmanager --install \
      "platform-tools;34.0.3"

 RUN sdkmanager --install \
+       "platforms;android-10" \
+       "platforms;android-11" \
+       "platforms;android-12" \
+       "platforms;android-13" \
+       "platforms;android-14" \
+       "platforms;android-15" \
+       "platforms;android-16" \
+       "platforms;android-17" \
+       "platforms;android-18" \
+       "platforms;android-19" \
+       "platforms;android-20" \
+       "platforms;android-21" \
+       "platforms;android-22" \
+       "platforms;android-23" \
+       "platforms;android-24" \
+       "platforms;android-25" \
+       "platforms;android-26" \
+       "platforms;android-27" \
       "platforms;android-28" \
       "platforms;android-29" \
+       "platforms;android-3" \
       "platforms;android-30" \
       "platforms;android-31" \
       "platforms;android-32" \
       "platforms;android-33" \
-       "platforms;android-34"
-#      "platforms;android-10" \
-#      "platforms;android-11" \
-#      "platforms;android-12" \
-#      "platforms;android-13" \
-#      "platforms;android-14" \
-#      "platforms;android-15" \
-#      "platforms;android-16" \
-#      "platforms;android-17" \
-#      "platforms;android-18" \
-#      "platforms;android-19" \
-#      "platforms;android-20" \
-#      "platforms;android-21" \
-#      "platforms;android-22" \
-#      "platforms;android-23" \
-#      "platforms;android-24" \
-#      "platforms;android-25" \
-#      "platforms;android-26" \
-#      "platforms;android-27" \
-#      "platforms;android-28" \
-#      "platforms;android-29" \
-#      "platforms;android-3" \
-#      "platforms;android-30" \
-#      "platforms;android-31" \
-#      "platforms;android-32" \
-#      "platforms;android-33" \
-#      "platforms;android-34" \
-#      "platforms;android-4" \
-#      "platforms;android-5" \
-#      "platforms;android-6" \
-#      "platforms;android-7" \
-#      "platforms;android-8" \
-#      "platforms;android-9"
+       "platforms;android-34" \
+       "platforms;android-4" \
+       "platforms;android-5" \
+       "platforms;android-6" \
+       "platforms;android-7" \
+       "platforms;android-8" \
+       "platforms;android-9"

-#RUN sdkmanager --install \
-#      "ndk-bundle;25.2.9519653"
+RUN sdkmanager --install \
 #      "ndk-bundle;11.0.2655954" \
 #      "ndk-bundle;11.1.2683735" \
 #      "ndk-bundle;11.2.2725575" \
@ -357,12 +333,11 @@ RUN sdkmanager --install \
 #      "ndk-bundle;25.0.8221429-beta2" \
 #      "ndk-bundle;25.0.8355429-beta3" \
 #      "ndk-bundle;25.0.8528842-beta4" \
-#      "ndk-bundle;25.0.8775105" \
-#      "ndk-bundle;25.1.8937393" \
-#      "ndk-bundle;25.2.9519653"
+       "ndk-bundle;25.0.8775105" \
+       "ndk-bundle;25.1.8937393" \
+       "ndk-bundle;25.2.9519653"

 RUN sdkmanager --install \
-      "ndk-bundle;r25"
 #      "ndk-bundle;r10e" \
 #      "ndk-bundle;r11" \
 #      "ndk-bundle;r11b" \
@ -414,16 +389,15 @@ RUN sdkmanager --install \
 #      "ndk-bundle;r24-beta1" \
 #      "ndk-bundle;r24-beta2" \
 #      "ndk-bundle;r24-rc1" \
-#      "ndk-bundle;r25" \
+       "ndk-bundle;r25" \
 #      "ndk-bundle;r25-beta1" \
 #      "ndk-bundle;r25-beta2" \
 #      "ndk-bundle;r25-beta3" \
 #      "ndk-bundle;r25-beta4" \
 #      "ndk-bundle;r25b" \
-#      "ndk-bundle;r25c"
+       "ndk-bundle;r25c"

-#RUN sdkmanager --install \
-#      "ndk;25.2.9519653"
+RUN sdkmanager --install \
 #      "ndk;11.0.2655954" \
 #      "ndk;11.1.2683735" \
 #      "ndk;11.2.2725575" \
@ -478,12 +452,11 @@ RUN sdkmanager --install \
 #      "ndk;25.0.8221429-beta2" \
 #      "ndk;25.0.8355429-beta3" \
 #      "ndk;25.0.8528842-beta4" \
-#      "ndk;25.0.8775105" \
-#      "ndk;25.1.8937393" \
-#      "ndk;25.2.9519653"
+       "ndk;25.0.8775105" \
+       "ndk;25.1.8937393" \
+       "ndk;25.2.9519653"

 RUN sdkmanager --install \
-      "ndk;r25"
 #      "ndk;r10e" \
 #      "ndk;r11" \
 #      "ndk;r11b" \
@ -535,13 +508,13 @@ RUN sdkmanager --install \
 #      "ndk;r24-beta1" \
 #      "ndk;r24-beta2" \
 #      "ndk;r24-rc1" \
-#      "ndk;r25" \
+       "ndk;r25" \
 #      "ndk;r25-beta1" \
 #      "ndk;r25-beta2" \
 #      "ndk;r25-beta3" \
 #      "ndk;r25-beta4" \
 #      "ndk;r25b" \
-#      "ndk;r25c"
+       "ndk;r25c"

 RUN sdkmanager --install \
      "tools" \
--- a/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile
+++ b/linux/ecosystem/gitlab/runner/android-sdk/jdk17/Dockerfile
@ -52,95 +52,88 @@ RUN apt update && \

 # Install ALL ANDROID SDK
 RUN sdkmanager --install \
+      "build-tools;17.0.0" \
+      "build-tools;18.0.0" \
+      "build-tools;18.0.1" \
+      "build-tools;18.1.0" \
+      "build-tools;18.1.1" \
+      "build-tools;19.0.0" \
+      "build-tools;19.0.1" \
+      "build-tools;19.0.2" \
+      "build-tools;19.0.3" \
+      "build-tools;19.1.0" \
+      "build-tools;20.0.0" \
+      "build-tools;21.0.0" \
+      "build-tools;21.0.1" \
+      "build-tools;21.0.2" \
+      "build-tools;21.1.0" \
+      "build-tools;21.1.1" \
+      "build-tools;21.1.2" \
+      "build-tools;22.0.0" \
+      "build-tools;22.0.1" \
+      "build-tools;23.0.0" \
+      "build-tools;23.0.1" \
+      "build-tools;23.0.2" \
+      "build-tools;23.0.3" \
+      "build-tools;24.0.0" \
+      "build-tools;24.0.1" \
+      "build-tools;24.0.2" \
+      "build-tools;24.0.3" \
+      "build-tools;25.0.0" \
+      "build-tools;25.0.1" \
+      "build-tools;25.0.2" \
+      "build-tools;25.0.3" \
+      "build-tools;26.0.0" \
+      "build-tools;26.0.0-rc1" \
+      "build-tools;26.0.0-rc2" \
+      "build-tools;26.0.1" \
+      "build-tools;26.0.2" \
+      "build-tools;26.0.3" \
+      "build-tools;27.0.0" \
+      "build-tools;27.0.1" \
+      "build-tools;27.0.2" \
+      "build-tools;27.0.3" \
+      "build-tools;28.0.0" \
+      "build-tools;28.0.0-rc1" \
+      "build-tools;28.0.0-rc2" \
+      "build-tools;28.0.1" \
+      "build-tools;28.0.2" \
      "build-tools;28.0.3" \
+      "build-tools;29.0.0" \
+      "build-tools;29.0.0-rc1" \
+      "build-tools;29.0.0-rc2" \
+      "build-tools;29.0.0-rc3" \
+      "build-tools;29.0.1" \
+      "build-tools;29.0.2" \
      "build-tools;29.0.3" \
+      "build-tools;30.0.0" \
+      "build-tools;30.0.0-rc1" \
+      "build-tools;30.0.0-rc2" \
+      "build-tools;30.0.0-rc3" \
+      "build-tools;30.0.0-rc4" \
+      "build-tools;30.0.1" \
+      "build-tools;30.0.2" \
      "build-tools;30.0.3" \
      "build-tools;31.0.0" \
+      "build-tools;31.0.0-rc1" \
+      "build-tools;31.0.0-rc2" \
+      "build-tools;31.0.0-rc3" \
+      "build-tools;31.0.0-rc4" \
+      "build-tools;31.0.0-rc5" \
      "build-tools;32.0.0" \
+      "build-tools;32.1.0-rc1" \
+      "build-tools;33.0.0" \
+      "build-tools;33.0.0-rc1" \
+      "build-tools;33.0.0-rc2" \
+      "build-tools;33.0.0-rc3" \
+      "build-tools;33.0.0-rc4" \
+      "build-tools;33.0.1" \
      "build-tools;33.0.2" \
-      "build-tools;34.0.0"
-#      "build-tools;17.0.0" \
-#      "build-tools;18.0.0" \
-#      "build-tools;18.0.1" \
-#      "build-tools;18.1.0" \
-#      "build-tools;18.1.1" \
-#      "build-tools;19.0.0" \
-#      "build-tools;19.0.1" \
-#      "build-tools;19.0.2" \
-#      "build-tools;19.0.3" \
-#      "build-tools;19.1.0" \
-#      "build-tools;20.0.0" \
-#      "build-tools;21.0.0" \
-#      "build-tools;21.0.1" \
-#      "build-tools;21.0.2" \
-#      "build-tools;21.1.0" \
-#      "build-tools;21.1.1" \
-#      "build-tools;21.1.2" \
-#      "build-tools;22.0.0" \
-#      "build-tools;22.0.1" \
-#      "build-tools;23.0.0" \
-#      "build-tools;23.0.1" \
-#      "build-tools;23.0.2" \
-#      "build-tools;23.0.3" \
-#      "build-tools;24.0.0" \
-#      "build-tools;24.0.1" \
-#      "build-tools;24.0.2" \
-#      "build-tools;24.0.3" \
-#      "build-tools;25.0.0" \
-#      "build-tools;25.0.1" \
-#      "build-tools;25.0.2" \
-#      "build-tools;25.0.3" \
-#      "build-tools;26.0.0" \
-#      "build-tools;26.0.0-rc1" \
-#      "build-tools;26.0.0-rc2" \
-#      "build-tools;26.0.1" \
-#      "build-tools;26.0.2" \
-#      "build-tools;26.0.3" \
-#      "build-tools;27.0.0" \
-#      "build-tools;27.0.1" \
-#      "build-tools;27.0.2" \
-#      "build-tools;27.0.3" \
-#      "build-tools;28.0.0" \
-#      "build-tools;28.0.0-rc1" \
-#      "build-tools;28.0.0-rc2" \
-#      "build-tools;28.0.1" \
-#      "build-tools;28.0.2" \
-#     "build-tools;28.0.3" \
-#      "build-tools;29.0.0" \
-#      "build-tools;29.0.0-rc1" \
-#      "build-tools;29.0.0-rc2" \
-#      "build-tools;29.0.0-rc3" \
-#      "build-tools;29.0.1" \
-#      "build-tools;29.0.2" \
-#     "build-tools;29.0.3" \
-#     "build-tools;30.0.0" \
-#     "build-tools;30.0.0-rc1" \
-#     "build-tools;30.0.0-rc2" \
-#     "build-tools;30.0.0-rc3" \
-#     "build-tools;30.0.0-rc4" \
-#     "build-tools;30.0.1" \
-#     "build-tools;30.0.2" \
-#     "build-tools;30.0.3" \
-#     "build-tools;31.0.0" \
-#     "build-tools;31.0.0-rc1" \
-#     "build-tools;31.0.0-rc2" \
-#     "build-tools;31.0.0-rc3" \
-#     "build-tools;31.0.0-rc4" \
-#     "build-tools;31.0.0-rc5" \
-#     "build-tools;32.0.0" \
-#     "build-tools;32.1.0-rc1" \
-#     "build-tools;33.0.0" \
-#     "build-tools;33.0.0-rc1" \
-#     "build-tools;33.0.0-rc2" \
-#     "build-tools;33.0.0-rc3" \
-#     "build-tools;33.0.0-rc4" \
-#     "build-tools;33.0.1" \
-#     "build-tools;33.0.2" \
-#     "build-tools;34.0.0" \
-#     "build-tools;34.0.0-rc1" \
-#     "build-tools;34.0.0-rc2" \
-#     "build-tools;34.0.0-rc3" \
-#     "build-tools;34.0.0-rc4"
+      "build-tools;34.0.0" \
+      "build-tools;34.0.0-rc1" \
+      "build-tools;34.0.0-rc2" \
+      "build-tools;34.0.0-rc3" \
+      "build-tools;34.0.0-rc4"


 RUN sdkmanager --install \
@ -172,6 +165,48 @@ RUN sdkmanager --install \

 RUN sdkmanager --install \
      "extras;android;m2repository" \
+      "extras;android;m2repository;01" \
+      "extras;android;m2repository;02" \
+      "extras;android;m2repository;03" \
+      "extras;android;m2repository;04" \
+      "extras;android;m2repository;06" \
+      "extras;android;m2repository;07" \
+      "extras;android;m2repository;08" \
+      "extras;android;m2repository;09" \
+      "extras;android;m2repository;1" \
+      "extras;android;m2repository;10" \
+      "extras;android;m2repository;11" \
+      "extras;android;m2repository;12" \
+      "extras;android;m2repository;13" \
+      "extras;android;m2repository;14" \
+      "extras;android;m2repository;15" \
+      "extras;android;m2repository;16" \
+      "extras;android;m2repository;17" \
+      "extras;android;m2repository;18" \
+      "extras;android;m2repository;19" \
+      "extras;android;m2repository;2" \
+      "extras;android;m2repository;20" \
+      "extras;android;m2repository;21" \
+      "extras;android;m2repository;22" \
+      "extras;android;m2repository;23" \
+      "extras;android;m2repository;24" \
+      "extras;android;m2repository;25" \
+      "extras;android;m2repository;26" \
+      "extras;android;m2repository;27" \
+      "extras;android;m2repository;28" \
+      "extras;android;m2repository;29" \
+      "extras;android;m2repository;3" \
+      "extras;android;m2repository;30" \
+      "extras;android;m2repository;31" \
+      "extras;android;m2repository;32" \
+      "extras;android;m2repository;33" \
+      "extras;android;m2repository;34" \
+      "extras;android;m2repository;35" \
+      "extras;android;m2repository;36" \
+      "extras;android;m2repository;37" \
+      "extras;android;m2repository;38" \
+      "extras;android;m2repository;39" \
+      "extras;android;m2repository;4" \
      "extras;android;m2repository;40" \
      "extras;android;m2repository;41" \
      "extras;android;m2repository;42" \
@ -179,62 +214,11 @@ RUN sdkmanager --install \
      "extras;android;m2repository;44" \
      "extras;android;m2repository;45" \
      "extras;android;m2repository;46" \
-      "extras;android;m2repository;47"
-#      "extras;android;m2repository" \
-#      "extras;android;m2repository;01" \
-#      "extras;android;m2repository;02" \
-#      "extras;android;m2repository;03" \
-#      "extras;android;m2repository;04" \
-#      "extras;android;m2repository;06" \
-#      "extras;android;m2repository;07" \
-#      "extras;android;m2repository;08" \
-#      "extras;android;m2repository;09" \
-#      "extras;android;m2repository;1" \
-#      "extras;android;m2repository;10" \
-#      "extras;android;m2repository;11" \
-#      "extras;android;m2repository;12" \
-#      "extras;android;m2repository;13" \
-#      "extras;android;m2repository;14" \
-#      "extras;android;m2repository;15" \
-#      "extras;android;m2repository;16" \
-#      "extras;android;m2repository;17" \
-#      "extras;android;m2repository;18" \
-#      "extras;android;m2repository;19" \
-#      "extras;android;m2repository;2" \
-#      "extras;android;m2repository;20" \
-#      "extras;android;m2repository;21" \
-#      "extras;android;m2repository;22" \
-#      "extras;android;m2repository;23" \
-#      "extras;android;m2repository;24" \
-#      "extras;android;m2repository;25" \
-#      "extras;android;m2repository;26" \
-#      "extras;android;m2repository;27" \
-#      "extras;android;m2repository;28" \
-#      "extras;android;m2repository;29" \
-#      "extras;android;m2repository;3" \
-#      "extras;android;m2repository;30" \
-#      "extras;android;m2repository;31" \
-#      "extras;android;m2repository;32" \
-#      "extras;android;m2repository;33" \
-#      "extras;android;m2repository;34" \
-#      "extras;android;m2repository;35" \
-#      "extras;android;m2repository;36" \
-#      "extras;android;m2repository;37" \
-#      "extras;android;m2repository;38" \
-#      "extras;android;m2repository;39" \
-#      "extras;android;m2repository;4" \
-#      "extras;android;m2repository;40" \
-#      "extras;android;m2repository;41" \
-#      "extras;android;m2repository;42" \
-#      "extras;android;m2repository;43" \
-#      "extras;android;m2repository;44" \
-#      "extras;android;m2repository;45" \
-#      "extras;android;m2repository;46" \
-#      "extras;android;m2repository;47" \
-#      "extras;android;m2repository;6" \
-#      "extras;android;m2repository;7" \
-#      "extras;android;m2repository;8" \
-#      "extras;android;m2repository;9"
+      "extras;android;m2repository;47" \
+      "extras;android;m2repository;6" \
+      "extras;android;m2repository;7" \
+      "extras;android;m2repository;8" \
+      "extras;android;m2repository;9"

 RUN sdkmanager --install \
      "platform-tools" \
@ -261,48 +245,40 @@ RUN sdkmanager --install \
      "platform-tools;34.0.3"

 RUN sdkmanager --install \
+       "platforms;android-10" \
+       "platforms;android-11" \
+       "platforms;android-12" \
+       "platforms;android-13" \
+       "platforms;android-14" \
+       "platforms;android-15" \
+       "platforms;android-16" \
+       "platforms;android-17" \
+       "platforms;android-18" \
+       "platforms;android-19" \
+       "platforms;android-20" \
+       "platforms;android-21" \
+       "platforms;android-22" \
+       "platforms;android-23" \
+       "platforms;android-24" \
+       "platforms;android-25" \
+       "platforms;android-26" \
+       "platforms;android-27" \
       "platforms;android-28" \
       "platforms;android-29" \
+       "platforms;android-3" \
       "platforms;android-30" \
       "platforms;android-31" \
       "platforms;android-32" \
       "platforms;android-33" \
-       "platforms;android-34"
-#      "platforms;android-10" \
-#      "platforms;android-11" \
-#      "platforms;android-12" \
-#      "platforms;android-13" \
-#      "platforms;android-14" \
-#      "platforms;android-15" \
-#      "platforms;android-16" \
-#      "platforms;android-17" \
-#      "platforms;android-18" \
-#      "platforms;android-19" \
-#      "platforms;android-20" \
-#      "platforms;android-21" \
-#      "platforms;android-22" \
-#      "platforms;android-23" \
-#      "platforms;android-24" \
-#      "platforms;android-25" \
-#      "platforms;android-26" \
-#      "platforms;android-27" \
-#      "platforms;android-28" \
-#      "platforms;android-29" \
-#      "platforms;android-3" \
-#      "platforms;android-30" \
-#      "platforms;android-31" \
-#      "platforms;android-32" \
-#      "platforms;android-33" \
-#      "platforms;android-34" \
-#      "platforms;android-4" \
-#      "platforms;android-5" \
-#      "platforms;android-6" \
-#      "platforms;android-7" \
-#      "platforms;android-8" \
-#      "platforms;android-9"
+       "platforms;android-34" \
+       "platforms;android-4" \
+       "platforms;android-5" \
+       "platforms;android-6" \
+       "platforms;android-7" \
+       "platforms;android-8" \
+       "platforms;android-9"

-#RUN sdkmanager --install \
-#      "ndk-bundle;25.2.9519653"
+RUN sdkmanager --install \
 #      "ndk-bundle;11.0.2655954" \
 #      "ndk-bundle;11.1.2683735" \
 #      "ndk-bundle;11.2.2725575" \
@ -357,12 +333,11 @@ RUN sdkmanager --install \
 #      "ndk-bundle;25.0.8221429-beta2" \
 #      "ndk-bundle;25.0.8355429-beta3" \
 #      "ndk-bundle;25.0.8528842-beta4" \
-#      "ndk-bundle;25.0.8775105" \
-#      "ndk-bundle;25.1.8937393" \
-#      "ndk-bundle;25.2.9519653"
+       "ndk-bundle;25.0.8775105" \
+       "ndk-bundle;25.1.8937393" \
+       "ndk-bundle;25.2.9519653"

 RUN sdkmanager --install \
-      "ndk-bundle;r25"
 #      "ndk-bundle;r10e" \
 #      "ndk-bundle;r11" \
 #      "ndk-bundle;r11b" \
@ -414,16 +389,15 @@ RUN sdkmanager --install \
 #      "ndk-bundle;r24-beta1" \
 #      "ndk-bundle;r24-beta2" \
 #      "ndk-bundle;r24-rc1" \
-#      "ndk-bundle;r25" \
+       "ndk-bundle;r25" \
 #      "ndk-bundle;r25-beta1" \
 #      "ndk-bundle;r25-beta2" \
 #      "ndk-bundle;r25-beta3" \
 #      "ndk-bundle;r25-beta4" \
 #      "ndk-bundle;r25b" \
-#      "ndk-bundle;r25c"
+       "ndk-bundle;r25c"

-#RUN sdkmanager --install \
-#      "ndk;25.2.9519653"
+RUN sdkmanager --install \
 #      "ndk;11.0.2655954" \
 #      "ndk;11.1.2683735" \
 #      "ndk;11.2.2725575" \
@ -478,12 +452,11 @@ RUN sdkmanager --install \
 #      "ndk;25.0.8221429-beta2" \
 #      "ndk;25.0.8355429-beta3" \
 #      "ndk;25.0.8528842-beta4" \
-#      "ndk;25.0.8775105" \
-#      "ndk;25.1.8937393" \
-#      "ndk;25.2.9519653"
+       "ndk;25.0.8775105" \
+       "ndk;25.1.8937393" \
+       "ndk;25.2.9519653"

 RUN sdkmanager --install \
-      "ndk;r25"
 #      "ndk;r10e" \
 #      "ndk;r11" \
 #      "ndk;r11b" \
@ -535,13 +508,13 @@ RUN sdkmanager --install \
 #      "ndk;r24-beta1" \
 #      "ndk;r24-beta2" \
 #      "ndk;r24-rc1" \
-#      "ndk;r25" \
+       "ndk;r25" \
 #      "ndk;r25-beta1" \
 #      "ndk;r25-beta2" \
 #      "ndk;r25-beta3" \
 #      "ndk;r25-beta4" \
 #      "ndk;r25b" \
-#      "ndk;r25c"
+       "ndk;r25c"

 RUN sdkmanager --install \
      "tools" \
--- a/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk11/Dockerfile
@ -39,95 +39,88 @@ RUN apt update && \

 # Install ALL ANDROID SDK
 RUN sdkmanager --install \
+      "build-tools;17.0.0" \
+      "build-tools;18.0.0" \
+      "build-tools;18.0.1" \
+      "build-tools;18.1.0" \
+      "build-tools;18.1.1" \
+      "build-tools;19.0.0" \
+      "build-tools;19.0.1" \
+      "build-tools;19.0.2" \
+      "build-tools;19.0.3" \
+      "build-tools;19.1.0" \
+      "build-tools;20.0.0" \
+      "build-tools;21.0.0" \
+      "build-tools;21.0.1" \
+      "build-tools;21.0.2" \
+      "build-tools;21.1.0" \
+      "build-tools;21.1.1" \
+      "build-tools;21.1.2" \
+      "build-tools;22.0.0" \
+      "build-tools;22.0.1" \
+      "build-tools;23.0.0" \
+      "build-tools;23.0.1" \
+      "build-tools;23.0.2" \
+      "build-tools;23.0.3" \
+      "build-tools;24.0.0" \
+      "build-tools;24.0.1" \
+      "build-tools;24.0.2" \
+      "build-tools;24.0.3" \
+      "build-tools;25.0.0" \
+      "build-tools;25.0.1" \
+      "build-tools;25.0.2" \
+      "build-tools;25.0.3" \
+      "build-tools;26.0.0" \
+      "build-tools;26.0.0-rc1" \
+      "build-tools;26.0.0-rc2" \
+      "build-tools;26.0.1" \
+      "build-tools;26.0.2" \
+      "build-tools;26.0.3" \
+      "build-tools;27.0.0" \
+      "build-tools;27.0.1" \
+      "build-tools;27.0.2" \
+      "build-tools;27.0.3" \
+      "build-tools;28.0.0" \
+      "build-tools;28.0.0-rc1" \
+      "build-tools;28.0.0-rc2" \
+      "build-tools;28.0.1" \
+      "build-tools;28.0.2" \
      "build-tools;28.0.3" \
+      "build-tools;29.0.0" \
+      "build-tools;29.0.0-rc1" \
+      "build-tools;29.0.0-rc2" \
+      "build-tools;29.0.0-rc3" \
+      "build-tools;29.0.1" \
+      "build-tools;29.0.2" \
      "build-tools;29.0.3" \
+      "build-tools;30.0.0" \
+      "build-tools;30.0.0-rc1" \
+      "build-tools;30.0.0-rc2" \
+      "build-tools;30.0.0-rc3" \
+      "build-tools;30.0.0-rc4" \
+      "build-tools;30.0.1" \
+      "build-tools;30.0.2" \
      "build-tools;30.0.3" \
      "build-tools;31.0.0" \
+      "build-tools;31.0.0-rc1" \
+      "build-tools;31.0.0-rc2" \
+      "build-tools;31.0.0-rc3" \
+      "build-tools;31.0.0-rc4" \
+      "build-tools;31.0.0-rc5" \
      "build-tools;32.0.0" \
+      "build-tools;32.1.0-rc1" \
+      "build-tools;33.0.0" \
+      "build-tools;33.0.0-rc1" \
+      "build-tools;33.0.0-rc2" \
+      "build-tools;33.0.0-rc3" \
+      "build-tools;33.0.0-rc4" \
+      "build-tools;33.0.1" \
      "build-tools;33.0.2" \
-      "build-tools;34.0.0"
-#      "build-tools;17.0.0" \
-#      "build-tools;18.0.0" \
-#      "build-tools;18.0.1" \
-#      "build-tools;18.1.0" \
-#      "build-tools;18.1.1" \
-#      "build-tools;19.0.0" \
-#      "build-tools;19.0.1" \
-#      "build-tools;19.0.2" \
-#      "build-tools;19.0.3" \
-#      "build-tools;19.1.0" \
-#      "build-tools;20.0.0" \
-#      "build-tools;21.0.0" \
-#      "build-tools;21.0.1" \
-#      "build-tools;21.0.2" \
-#      "build-tools;21.1.0" \
-#      "build-tools;21.1.1" \
-#      "build-tools;21.1.2" \
-#      "build-tools;22.0.0" \
-#      "build-tools;22.0.1" \
-#      "build-tools;23.0.0" \
-#      "build-tools;23.0.1" \
-#      "build-tools;23.0.2" \
-#      "build-tools;23.0.3" \
-#      "build-tools;24.0.0" \
-#      "build-tools;24.0.1" \
-#      "build-tools;24.0.2" \
-#      "build-tools;24.0.3" \
-#      "build-tools;25.0.0" \
-#      "build-tools;25.0.1" \
-#      "build-tools;25.0.2" \
-#      "build-tools;25.0.3" \
-#      "build-tools;26.0.0" \
-#      "build-tools;26.0.0-rc1" \
-#      "build-tools;26.0.0-rc2" \
-#      "build-tools;26.0.1" \
-#      "build-tools;26.0.2" \
-#      "build-tools;26.0.3" \
-#      "build-tools;27.0.0" \
-#      "build-tools;27.0.1" \
-#      "build-tools;27.0.2" \
-#      "build-tools;27.0.3" \
-#      "build-tools;28.0.0" \
-#      "build-tools;28.0.0-rc1" \
-#      "build-tools;28.0.0-rc2" \
-#      "build-tools;28.0.1" \
-#      "build-tools;28.0.2" \
-#     "build-tools;28.0.3" \
-#      "build-tools;29.0.0" \
-#      "build-tools;29.0.0-rc1" \
-#      "build-tools;29.0.0-rc2" \
-#      "build-tools;29.0.0-rc3" \
-#      "build-tools;29.0.1" \
-#      "build-tools;29.0.2" \
-#     "build-tools;29.0.3" \
-#     "build-tools;30.0.0" \
-#     "build-tools;30.0.0-rc1" \
-#     "build-tools;30.0.0-rc2" \
-#     "build-tools;30.0.0-rc3" \
-#     "build-tools;30.0.0-rc4" \
-#     "build-tools;30.0.1" \
-#     "build-tools;30.0.2" \
-#     "build-tools;30.0.3" \
-#     "build-tools;31.0.0" \
-#     "build-tools;31.0.0-rc1" \
-#     "build-tools;31.0.0-rc2" \
-#     "build-tools;31.0.0-rc3" \
-#     "build-tools;31.0.0-rc4" \
-#     "build-tools;31.0.0-rc5" \
-#     "build-tools;32.0.0" \
-#     "build-tools;32.1.0-rc1" \
-#     "build-tools;33.0.0" \
-#     "build-tools;33.0.0-rc1" \
-#     "build-tools;33.0.0-rc2" \
-#     "build-tools;33.0.0-rc3" \
-#     "build-tools;33.0.0-rc4" \
-#     "build-tools;33.0.1" \
-#     "build-tools;33.0.2" \
-#     "build-tools;34.0.0" \
-#     "build-tools;34.0.0-rc1" \
-#     "build-tools;34.0.0-rc2" \
-#     "build-tools;34.0.0-rc3" \
-#     "build-tools;34.0.0-rc4"
+      "build-tools;34.0.0" \
+      "build-tools;34.0.0-rc1" \
+      "build-tools;34.0.0-rc2" \
+      "build-tools;34.0.0-rc3" \
+      "build-tools;34.0.0-rc4"


 RUN sdkmanager --install \
@ -159,6 +152,48 @@ RUN sdkmanager --install \

 RUN sdkmanager --install \
      "extras;android;m2repository" \
+      "extras;android;m2repository;01" \
+      "extras;android;m2repository;02" \
+      "extras;android;m2repository;03" \
+      "extras;android;m2repository;04" \
+      "extras;android;m2repository;06" \
+      "extras;android;m2repository;07" \
+      "extras;android;m2repository;08" \
+      "extras;android;m2repository;09" \
+      "extras;android;m2repository;1" \
+      "extras;android;m2repository;10" \
+      "extras;android;m2repository;11" \
+      "extras;android;m2repository;12" \
+      "extras;android;m2repository;13" \
+      "extras;android;m2repository;14" \
+      "extras;android;m2repository;15" \
+      "extras;android;m2repository;16" \
+      "extras;android;m2repository;17" \
+      "extras;android;m2repository;18" \
+      "extras;android;m2repository;19" \
+      "extras;android;m2repository;2" \
+      "extras;android;m2repository;20" \
+      "extras;android;m2repository;21" \
+      "extras;android;m2repository;22" \
+      "extras;android;m2repository;23" \
+      "extras;android;m2repository;24" \
+      "extras;android;m2repository;25" \
+      "extras;android;m2repository;26" \
+      "extras;android;m2repository;27" \
+      "extras;android;m2repository;28" \
+      "extras;android;m2repository;29" \
+      "extras;android;m2repository;3" \
+      "extras;android;m2repository;30" \
+      "extras;android;m2repository;31" \
+      "extras;android;m2repository;32" \
+      "extras;android;m2repository;33" \
+      "extras;android;m2repository;34" \
+      "extras;android;m2repository;35" \
+      "extras;android;m2repository;36" \
+      "extras;android;m2repository;37" \
+      "extras;android;m2repository;38" \
+      "extras;android;m2repository;39" \
+      "extras;android;m2repository;4" \
      "extras;android;m2repository;40" \
      "extras;android;m2repository;41" \
      "extras;android;m2repository;42" \
@ -166,62 +201,11 @@ RUN sdkmanager --install \
      "extras;android;m2repository;44" \
      "extras;android;m2repository;45" \
      "extras;android;m2repository;46" \
-      "extras;android;m2repository;47"
-#      "extras;android;m2repository" \
-#      "extras;android;m2repository;01" \
-#      "extras;android;m2repository;02" \
-#      "extras;android;m2repository;03" \
-#      "extras;android;m2repository;04" \
-#      "extras;android;m2repository;06" \
-#      "extras;android;m2repository;07" \
-#      "extras;android;m2repository;08" \
-#      "extras;android;m2repository;09" \
-#      "extras;android;m2repository;1" \
-#      "extras;android;m2repository;10" \
-#      "extras;android;m2repository;11" \
-#      "extras;android;m2repository;12" \
-#      "extras;android;m2repository;13" \
-#      "extras;android;m2repository;14" \
-#      "extras;android;m2repository;15" \
-#      "extras;android;m2repository;16" \
-#      "extras;android;m2repository;17" \
-#      "extras;android;m2repository;18" \
-#      "extras;android;m2repository;19" \
-#      "extras;android;m2repository;2" \
-#      "extras;android;m2repository;20" \
-#      "extras;android;m2repository;21" \
-#      "extras;android;m2repository;22" \
-#      "extras;android;m2repository;23" \
-#      "extras;android;m2repository;24" \
-#      "extras;android;m2repository;25" \
-#      "extras;android;m2repository;26" \
-#      "extras;android;m2repository;27" \
-#      "extras;android;m2repository;28" \
-#      "extras;android;m2repository;29" \
-#      "extras;android;m2repository;3" \
-#      "extras;android;m2repository;30" \
-#      "extras;android;m2repository;31" \
-#      "extras;android;m2repository;32" \
-#      "extras;android;m2repository;33" \
-#      "extras;android;m2repository;34" \
-#      "extras;android;m2repository;35" \
-#      "extras;android;m2repository;36" \
-#      "extras;android;m2repository;37" \
-#      "extras;android;m2repository;38" \
-#      "extras;android;m2repository;39" \
-#      "extras;android;m2repository;4" \
-#      "extras;android;m2repository;40" \
-#      "extras;android;m2repository;41" \
-#      "extras;android;m2repository;42" \
-#      "extras;android;m2repository;43" \
-#      "extras;android;m2repository;44" \
-#      "extras;android;m2repository;45" \
-#      "extras;android;m2repository;46" \
-#      "extras;android;m2repository;47" \
-#      "extras;android;m2repository;6" \
-#      "extras;android;m2repository;7" \
-#      "extras;android;m2repository;8" \
-#      "extras;android;m2repository;9"
+      "extras;android;m2repository;47" \
+      "extras;android;m2repository;6" \
+      "extras;android;m2repository;7" \
+      "extras;android;m2repository;8" \
+      "extras;android;m2repository;9"

 RUN sdkmanager --install \
      "platform-tools" \
@ -248,48 +232,40 @@ RUN sdkmanager --install \
      "platform-tools;34.0.3"

 RUN sdkmanager --install \
+       "platforms;android-10" \
+       "platforms;android-11" \
+       "platforms;android-12" \
+       "platforms;android-13" \
+       "platforms;android-14" \
+       "platforms;android-15" \
+       "platforms;android-16" \
+       "platforms;android-17" \
+       "platforms;android-18" \
+       "platforms;android-19" \
+       "platforms;android-20" \
+       "platforms;android-21" \
+       "platforms;android-22" \
+       "platforms;android-23" \
+       "platforms;android-24" \
+       "platforms;android-25" \
+       "platforms;android-26" \
+       "platforms;android-27" \
       "platforms;android-28" \
       "platforms;android-29" \
+       "platforms;android-3" \
       "platforms;android-30" \
       "platforms;android-31" \
       "platforms;android-32" \
       "platforms;android-33" \
-       "platforms;android-34"
-#      "platforms;android-10" \
-#      "platforms;android-11" \
-#      "platforms;android-12" \
-#      "platforms;android-13" \
-#      "platforms;android-14" \
-#      "platforms;android-15" \
-#      "platforms;android-16" \
-#      "platforms;android-17" \
-#      "platforms;android-18" \
-#      "platforms;android-19" \
-#      "platforms;android-20" \
-#      "platforms;android-21" \
-#      "platforms;android-22" \
-#      "platforms;android-23" \
-#      "platforms;android-24" \
-#      "platforms;android-25" \
-#      "platforms;android-26" \
-#      "platforms;android-27" \
-#      "platforms;android-28" \
-#      "platforms;android-29" \
-#      "platforms;android-3" \
-#      "platforms;android-30" \
-#      "platforms;android-31" \
-#      "platforms;android-32" \
-#      "platforms;android-33" \
-#      "platforms;android-34" \
-#      "platforms;android-4" \
-#      "platforms;android-5" \
-#      "platforms;android-6" \
-#      "platforms;android-7" \
-#      "platforms;android-8" \
-#      "platforms;android-9"
+       "platforms;android-34" \
+       "platforms;android-4" \
+       "platforms;android-5" \
+       "platforms;android-6" \
+       "platforms;android-7" \
+       "platforms;android-8" \
+       "platforms;android-9"

-#RUN sdkmanager --install \
-#      "ndk-bundle;25.2.9519653"
+RUN sdkmanager --install \
 #      "ndk-bundle;11.0.2655954" \
 #      "ndk-bundle;11.1.2683735" \
 #      "ndk-bundle;11.2.2725575" \
@ -344,12 +320,11 @@ RUN sdkmanager --install \
 #      "ndk-bundle;25.0.8221429-beta2" \
 #      "ndk-bundle;25.0.8355429-beta3" \
 #      "ndk-bundle;25.0.8528842-beta4" \
-#      "ndk-bundle;25.0.8775105" \
-#      "ndk-bundle;25.1.8937393" \
-#      "ndk-bundle;25.2.9519653"
+       "ndk-bundle;25.0.8775105" \
+       "ndk-bundle;25.1.8937393" \
+       "ndk-bundle;25.2.9519653"

 RUN sdkmanager --install \
-      "ndk-bundle;r25"
 #      "ndk-bundle;r10e" \
 #      "ndk-bundle;r11" \
 #      "ndk-bundle;r11b" \
@ -401,16 +376,15 @@ RUN sdkmanager --install \
 #      "ndk-bundle;r24-beta1" \
 #      "ndk-bundle;r24-beta2" \
 #      "ndk-bundle;r24-rc1" \
-#      "ndk-bundle;r25" \
+       "ndk-bundle;r25" \
 #      "ndk-bundle;r25-beta1" \
 #      "ndk-bundle;r25-beta2" \
 #      "ndk-bundle;r25-beta3" \
 #      "ndk-bundle;r25-beta4" \
 #      "ndk-bundle;r25b" \
-#      "ndk-bundle;r25c"
+       "ndk-bundle;r25c"

-#RUN sdkmanager --install \
-#      "ndk;25.2.9519653"
+RUN sdkmanager --install \
 #      "ndk;11.0.2655954" \
 #      "ndk;11.1.2683735" \
 #      "ndk;11.2.2725575" \
@ -465,12 +439,11 @@ RUN sdkmanager --install \
 #      "ndk;25.0.8221429-beta2" \
 #      "ndk;25.0.8355429-beta3" \
 #      "ndk;25.0.8528842-beta4" \
-#      "ndk;25.0.8775105" \
-#      "ndk;25.1.8937393" \
-#      "ndk;25.2.9519653"
+       "ndk;25.0.8775105" \
+       "ndk;25.1.8937393" \
+       "ndk;25.2.9519653"

 RUN sdkmanager --install \
-      "ndk;r25"
 #      "ndk;r10e" \
 #      "ndk;r11" \
 #      "ndk;r11b" \
@ -522,13 +495,13 @@ RUN sdkmanager --install \
 #      "ndk;r24-beta1" \
 #      "ndk;r24-beta2" \
 #      "ndk;r24-rc1" \
-#      "ndk;r25" \
+       "ndk;r25" \
 #      "ndk;r25-beta1" \
 #      "ndk;r25-beta2" \
 #      "ndk;r25-beta3" \
 #      "ndk;r25-beta4" \
 #      "ndk;r25b" \
-#      "ndk;r25c"
+       "ndk;r25c"

 RUN sdkmanager --install \
      "tools" \
--- a/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
+++ b/linux/ecosystem/teamcity/agent/android-sdk/jdk17/Dockerfile
@ -39,95 +39,88 @@ RUN apt update && \

 # Install ALL ANDROID SDK
 RUN sdkmanager --install \
+      "build-tools;17.0.0" \
+      "build-tools;18.0.0" \
+      "build-tools;18.0.1" \
+      "build-tools;18.1.0" \
+      "build-tools;18.1.1" \
+      "build-tools;19.0.0" \
+      "build-tools;19.0.1" \
+      "build-tools;19.0.2" \
+      "build-tools;19.0.3" \
+      "build-tools;19.1.0" \
+      "build-tools;20.0.0" \
+      "build-tools;21.0.0" \
+      "build-tools;21.0.1" \
+      "build-tools;21.0.2" \
+      "build-tools;21.1.0" \
+      "build-tools;21.1.1" \
+      "build-tools;21.1.2" \
+      "build-tools;22.0.0" \
+      "build-tools;22.0.1" \
+      "build-tools;23.0.0" \
+      "build-tools;23.0.1" \
+      "build-tools;23.0.2" \
+      "build-tools;23.0.3" \
+      "build-tools;24.0.0" \
+      "build-tools;24.0.1" \
+      "build-tools;24.0.2" \
+      "build-tools;24.0.3" \
+      "build-tools;25.0.0" \
+      "build-tools;25.0.1" \
+      "build-tools;25.0.2" \
+      "build-tools;25.0.3" \
+      "build-tools;26.0.0" \
+      "build-tools;26.0.0-rc1" \
+      "build-tools;26.0.0-rc2" \
+      "build-tools;26.0.1" \
+      "build-tools;26.0.2" \
+      "build-tools;26.0.3" \
+      "build-tools;27.0.0" \
+      "build-tools;27.0.1" \
+      "build-tools;27.0.2" \
+      "build-tools;27.0.3" \
+      "build-tools;28.0.0" \
+      "build-tools;28.0.0-rc1" \
+      "build-tools;28.0.0-rc2" \
+      "build-tools;28.0.1" \
+      "build-tools;28.0.2" \
      "build-tools;28.0.3" \
+      "build-tools;29.0.0" \
+      "build-tools;29.0.0-rc1" \
+      "build-tools;29.0.0-rc2" \
+      "build-tools;29.0.0-rc3" \
+      "build-tools;29.0.1" \
+      "build-tools;29.0.2" \
      "build-tools;29.0.3" \
+      "build-tools;30.0.0" \
+      "build-tools;30.0.0-rc1" \
+      "build-tools;30.0.0-rc2" \
+      "build-tools;30.0.0-rc3" \
+      "build-tools;30.0.0-rc4" \
+      "build-tools;30.0.1" \
+      "build-tools;30.0.2" \
      "build-tools;30.0.3" \
      "build-tools;31.0.0" \
+      "build-tools;31.0.0-rc1" \
+      "build-tools;31.0.0-rc2" \
+      "build-tools;31.0.0-rc3" \
+      "build-tools;31.0.0-rc4" \
+      "build-tools;31.0.0-rc5" \
      "build-tools;32.0.0" \
+      "build-tools;32.1.0-rc1" \
+      "build-tools;33.0.0" \
+      "build-tools;33.0.0-rc1" \
+      "build-tools;33.0.0-rc2" \
+      "build-tools;33.0.0-rc3" \
+      "build-tools;33.0.0-rc4" \
+      "build-tools;33.0.1" \
      "build-tools;33.0.2" \
-      "build-tools;34.0.0"
-#      "build-tools;17.0.0" \
-#      "build-tools;18.0.0" \
-#      "build-tools;18.0.1" \
-#      "build-tools;18.1.0" \
-#      "build-tools;18.1.1" \
-#      "build-tools;19.0.0" \
-#      "build-tools;19.0.1" \
-#      "build-tools;19.0.2" \
-#      "build-tools;19.0.3" \
-#      "build-tools;19.1.0" \
-#      "build-tools;20.0.0" \
-#      "build-tools;21.0.0" \
-#      "build-tools;21.0.1" \
-#      "build-tools;21.0.2" \
-#      "build-tools;21.1.0" \
-#      "build-tools;21.1.1" \
-#      "build-tools;21.1.2" \
-#      "build-tools;22.0.0" \
-#      "build-tools;22.0.1" \
-#      "build-tools;23.0.0" \
-#      "build-tools;23.0.1" \
-#      "build-tools;23.0.2" \
-#      "build-tools;23.0.3" \
-#      "build-tools;24.0.0" \
-#      "build-tools;24.0.1" \
-#      "build-tools;24.0.2" \
-#      "build-tools;24.0.3" \
-#      "build-tools;25.0.0" \
-#      "build-tools;25.0.1" \
-#      "build-tools;25.0.2" \
-#      "build-tools;25.0.3" \
-#      "build-tools;26.0.0" \
-#      "build-tools;26.0.0-rc1" \
-#      "build-tools;26.0.0-rc2" \
-#      "build-tools;26.0.1" \
-#      "build-tools;26.0.2" \
-#      "build-tools;26.0.3" \
-#      "build-tools;27.0.0" \
-#      "build-tools;27.0.1" \
-#      "build-tools;27.0.2" \
-#      "build-tools;27.0.3" \
-#      "build-tools;28.0.0" \
-#      "build-tools;28.0.0-rc1" \
-#      "build-tools;28.0.0-rc2" \
-#      "build-tools;28.0.1" \
-#      "build-tools;28.0.2" \
-#     "build-tools;28.0.3" \
-#      "build-tools;29.0.0" \
-#      "build-tools;29.0.0-rc1" \
-#      "build-tools;29.0.0-rc2" \
-#      "build-tools;29.0.0-rc3" \
-#      "build-tools;29.0.1" \
-#      "build-tools;29.0.2" \
-#     "build-tools;29.0.3" \
-#     "build-tools;30.0.0" \
-#     "build-tools;30.0.0-rc1" \
-#     "build-tools;30.0.0-rc2" \
-#     "build-tools;30.0.0-rc3" \
-#     "build-tools;30.0.0-rc4" \
-#     "build-tools;30.0.1" \
-#     "build-tools;30.0.2" \
-#     "build-tools;30.0.3" \
-#     "build-tools;31.0.0" \
-#     "build-tools;31.0.0-rc1" \
-#     "build-tools;31.0.0-rc2" \
-#     "build-tools;31.0.0-rc3" \
-#     "build-tools;31.0.0-rc4" \
-#     "build-tools;31.0.0-rc5" \
-#     "build-tools;32.0.0" \
-#     "build-tools;32.1.0-rc1" \
-#     "build-tools;33.0.0" \
-#     "build-tools;33.0.0-rc1" \
-#     "build-tools;33.0.0-rc2" \
-#     "build-tools;33.0.0-rc3" \
-#     "build-tools;33.0.0-rc4" \
-#     "build-tools;33.0.1" \
-#     "build-tools;33.0.2" \
-#     "build-tools;34.0.0" \
-#     "build-tools;34.0.0-rc1" \
-#     "build-tools;34.0.0-rc2" \
-#     "build-tools;34.0.0-rc3" \
-#     "build-tools;34.0.0-rc4"
+      "build-tools;34.0.0" \
+      "build-tools;34.0.0-rc1" \
+      "build-tools;34.0.0-rc2" \
+      "build-tools;34.0.0-rc3" \
+      "build-tools;34.0.0-rc4"


 RUN sdkmanager --install \
@ -159,6 +152,48 @@ RUN sdkmanager --install \

 RUN sdkmanager --install \
      "extras;android;m2repository" \
+      "extras;android;m2repository;01" \
+      "extras;android;m2repository;02" \
+      "extras;android;m2repository;03" \
+      "extras;android;m2repository;04" \
+      "extras;android;m2repository;06" \
+      "extras;android;m2repository;07" \
+      "extras;android;m2repository;08" \
+      "extras;android;m2repository;09" \
+      "extras;android;m2repository;1" \
+      "extras;android;m2repository;10" \
+      "extras;android;m2repository;11" \
+      "extras;android;m2repository;12" \
+      "extras;android;m2repository;13" \
+      "extras;android;m2repository;14" \
+      "extras;android;m2repository;15" \
+      "extras;android;m2repository;16" \
+      "extras;android;m2repository;17" \
+      "extras;android;m2repository;18" \
+      "extras;android;m2repository;19" \
+      "extras;android;m2repository;2" \
+      "extras;android;m2repository;20" \
+      "extras;android;m2repository;21" \
+      "extras;android;m2repository;22" \
+      "extras;android;m2repository;23" \
+      "extras;android;m2repository;24" \
+      "extras;android;m2repository;25" \
+      "extras;android;m2repository;26" \
+      "extras;android;m2repository;27" \
+      "extras;android;m2repository;28" \
+      "extras;android;m2repository;29" \
+      "extras;android;m2repository;3" \
+      "extras;android;m2repository;30" \
+      "extras;android;m2repository;31" \
+      "extras;android;m2repository;32" \
+      "extras;android;m2repository;33" \
+      "extras;android;m2repository;34" \
+      "extras;android;m2repository;35" \
+      "extras;android;m2repository;36" \
+      "extras;android;m2repository;37" \
+      "extras;android;m2repository;38" \
+      "extras;android;m2repository;39" \
+      "extras;android;m2repository;4" \
      "extras;android;m2repository;40" \
      "extras;android;m2repository;41" \
      "extras;android;m2repository;42" \
@ -166,62 +201,11 @@ RUN sdkmanager --install \
      "extras;android;m2repository;44" \
      "extras;android;m2repository;45" \
      "extras;android;m2repository;46" \
-      "extras;android;m2repository;47"
-#      "extras;android;m2repository" \
-#      "extras;android;m2repository;01" \
-#      "extras;android;m2repository;02" \
-#      "extras;android;m2repository;03" \
-#      "extras;android;m2repository;04" \
-#      "extras;android;m2repository;06" \
-#      "extras;android;m2repository;07" \
-#      "extras;android;m2repository;08" \
-#      "extras;android;m2repository;09" \
-#      "extras;android;m2repository;1" \
-#      "extras;android;m2repository;10" \
-#      "extras;android;m2repository;11" \
-#      "extras;android;m2repository;12" \
-#      "extras;android;m2repository;13" \
-#      "extras;android;m2repository;14" \
-#      "extras;android;m2repository;15" \
-#      "extras;android;m2repository;16" \
-#      "extras;android;m2repository;17" \
-#      "extras;android;m2repository;18" \
-#      "extras;android;m2repository;19" \
-#      "extras;android;m2repository;2" \
-#      "extras;android;m2repository;20" \
-#      "extras;android;m2repository;21" \
-#      "extras;android;m2repository;22" \
-#      "extras;android;m2repository;23" \
-#      "extras;android;m2repository;24" \
-#      "extras;android;m2repository;25" \
-#      "extras;android;m2repository;26" \
-#      "extras;android;m2repository;27" \
-#      "extras;android;m2repository;28" \
-#      "extras;android;m2repository;29" \
-#      "extras;android;m2repository;3" \
-#      "extras;android;m2repository;30" \
-#      "extras;android;m2repository;31" \
-#      "extras;android;m2repository;32" \
-#      "extras;android;m2repository;33" \
-#      "extras;android;m2repository;34" \
-#      "extras;android;m2repository;35" \
-#      "extras;android;m2repository;36" \
-#      "extras;android;m2repository;37" \
-#      "extras;android;m2repository;38" \
-#      "extras;android;m2repository;39" \
-#      "extras;android;m2repository;4" \
-#      "extras;android;m2repository;40" \
-#      "extras;android;m2repository;41" \
-#      "extras;android;m2repository;42" \
-#      "extras;android;m2repository;43" \
-#      "extras;android;m2repository;44" \
-#      "extras;android;m2repository;45" \
-#      "extras;android;m2repository;46" \
-#      "extras;android;m2repository;47" \
-#      "extras;android;m2repository;6" \
-#      "extras;android;m2repository;7" \
-#      "extras;android;m2repository;8" \
-#      "extras;android;m2repository;9"
+      "extras;android;m2repository;47" \
+      "extras;android;m2repository;6" \
+      "extras;android;m2repository;7" \
+      "extras;android;m2repository;8" \
+      "extras;android;m2repository;9"

 RUN sdkmanager --install \
      "platform-tools" \
@ -248,48 +232,40 @@ RUN sdkmanager --install \
      "platform-tools;34.0.3"

 RUN sdkmanager --install \
+       "platforms;android-10" \
+       "platforms;android-11" \
+       "platforms;android-12" \
+       "platforms;android-13" \
+       "platforms;android-14" \
+       "platforms;android-15" \
+       "platforms;android-16" \
+       "platforms;android-17" \
+       "platforms;android-18" \
+       "platforms;android-19" \
+       "platforms;android-20" \
+       "platforms;android-21" \
+       "platforms;android-22" \
+       "platforms;android-23" \
+       "platforms;android-24" \
+       "platforms;android-25" \
+       "platforms;android-26" \
+       "platforms;android-27" \
       "platforms;android-28" \
       "platforms;android-29" \
+       "platforms;android-3" \
       "platforms;android-30" \
       "platforms;android-31" \
       "platforms;android-32" \
       "platforms;android-33" \
-       "platforms;android-34"
-#      "platforms;android-10" \
-#      "platforms;android-11" \
-#      "platforms;android-12" \
-#      "platforms;android-13" \
-#      "platforms;android-14" \
-#      "platforms;android-15" \
-#      "platforms;android-16" \
-#      "platforms;android-17" \
-#      "platforms;android-18" \
-#      "platforms;android-19" \
-#      "platforms;android-20" \
-#      "platforms;android-21" \
-#      "platforms;android-22" \
-#      "platforms;android-23" \
-#      "platforms;android-24" \
-#      "platforms;android-25" \
-#      "platforms;android-26" \
-#      "platforms;android-27" \
-#      "platforms;android-28" \
-#      "platforms;android-29" \
-#      "platforms;android-3" \
-#      "platforms;android-30" \
-#      "platforms;android-31" \
-#      "platforms;android-32" \
-#      "platforms;android-33" \
-#      "platforms;android-34" \
-#      "platforms;android-4" \
-#      "platforms;android-5" \
-#      "platforms;android-6" \
-#      "platforms;android-7" \
-#      "platforms;android-8" \
-#      "platforms;android-9"
+       "platforms;android-34" \
+       "platforms;android-4" \
+       "platforms;android-5" \
+       "platforms;android-6" \
+       "platforms;android-7" \
+       "platforms;android-8" \
+       "platforms;android-9"

-#RUN sdkmanager --install \
-#      "ndk-bundle;25.2.9519653"
+RUN sdkmanager --install \
 #      "ndk-bundle;11.0.2655954" \
 #      "ndk-bundle;11.1.2683735" \
 #      "ndk-bundle;11.2.2725575" \
@ -344,12 +320,11 @@ RUN sdkmanager --install \
 #      "ndk-bundle;25.0.8221429-beta2" \
 #      "ndk-bundle;25.0.8355429-beta3" \
 #      "ndk-bundle;25.0.8528842-beta4" \
-#      "ndk-bundle;25.0.8775105" \
-#      "ndk-bundle;25.1.8937393" \
-#      "ndk-bundle;25.2.9519653"
+       "ndk-bundle;25.0.8775105" \
+       "ndk-bundle;25.1.8937393" \
+       "ndk-bundle;25.2.9519653"

 RUN sdkmanager --install \
-      "ndk-bundle;r25"
 #      "ndk-bundle;r10e" \
 #      "ndk-bundle;r11" \
 #      "ndk-bundle;r11b" \
@ -401,16 +376,15 @@ RUN sdkmanager --install \
 #      "ndk-bundle;r24-beta1" \
 #      "ndk-bundle;r24-beta2" \
 #      "ndk-bundle;r24-rc1" \
-#      "ndk-bundle;r25" \
+       "ndk-bundle;r25" \
 #      "ndk-bundle;r25-beta1" \
 #      "ndk-bundle;r25-beta2" \
 #      "ndk-bundle;r25-beta3" \
 #      "ndk-bundle;r25-beta4" \
 #      "ndk-bundle;r25b" \
-#      "ndk-bundle;r25c"
+       "ndk-bundle;r25c"

-#RUN sdkmanager --install \
-#      "ndk;25.2.9519653"
+RUN sdkmanager --install \
 #      "ndk;11.0.2655954" \
 #      "ndk;11.1.2683735" \
 #      "ndk;11.2.2725575" \
@ -465,12 +439,11 @@ RUN sdkmanager --install \
 #      "ndk;25.0.8221429-beta2" \
 #      "ndk;25.0.8355429-beta3" \
 #      "ndk;25.0.8528842-beta4" \
-#      "ndk;25.0.8775105" \
-#      "ndk;25.1.8937393" \
-#      "ndk;25.2.9519653"
+       "ndk;25.0.8775105" \
+       "ndk;25.1.8937393" \
+       "ndk;25.2.9519653"

 RUN sdkmanager --install \
-      "ndk;r25"
 #      "ndk;r10e" \
 #      "ndk;r11" \
 #      "ndk;r11b" \
@ -522,13 +495,13 @@ RUN sdkmanager --install \
 #      "ndk;r24-beta1" \
 #      "ndk;r24-beta2" \
 #      "ndk;r24-rc1" \
-#      "ndk;r25" \
+       "ndk;r25" \
 #      "ndk;r25-beta1" \
 #      "ndk;r25-beta2" \
 #      "ndk;r25-beta3" \
 #      "ndk;r25-beta4" \
 #      "ndk;r25b" \
-#      "ndk;r25c"
+       "ndk;r25c"

 RUN sdkmanager --install \
      "tools" \