working version beta

Dockerfile

@@ -5,17 +5,17 @@ ARG S6_OVERLAY_VERSION=3.2.1.0
 ARG SERVER_VERSION 8.3.24.1586
 
 # Variables For Container
-ENV LANG ru_RU.UTF8
-ENV LC_ALL ru_RU.UTF8
-ENV TZ Europe/Moscow
-ENV SERVER_VERSION ${SERVER_VERSION}
-ENV USER usr1cv8
-ENV SERVER_DATA /home/${USER}
-ENV BASE_DIR /bases
-ENV WORKDIR /opt/1cv8/x86_64/${SERVER_VERSION}/
+# Common
+ENV LANG=ru_RU.UTF8
+ENV LC_ALL=ru_RU.UTF8
+ENV TZ=Europe/Moscow
+# Server
+ENV SERVER_VERSION=${SERVER_VERSION}
+ENV BASES_DIR=/bases
+ENV WORKDIR=/opt/1cv8/x86_64/${SERVER_VERSION}/
+ENV LIC_DIR=/var/1C/licenses
+ENV JAVA_HOME=/opt/1cv8/x86_64/${SERVER_VERSION}/jre/
 
-# add repo for debian 11
-#RUN sed -r -i 's/^deb(.*)$/deb\1 contrib/g' /etc/apt/sources.list
 # add contrib repo for debian 13 and install requiments
 RUN sed -i '/Components:/s/$/ contrib/' /etc/apt/sources.list.d/debian.sources
 RUN apt-get -qq update \
@@ -36,6 +36,7 @@ RUN apt-get -qq update \
     libwebkit2gtk-4.0-37 \
   && apt-get clean && apt-get autoremove
 
+# Set locale
 RUN locale-gen ${LANG} \
   && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
@@ -44,22 +45,21 @@ ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLA
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-x86_64.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz
-
-# explicitly set user/group IDs 
-RUN set -eux; \
-  groupadd -r ${USER} --gid=1001; \
-	useradd -m -r -g ${USER} --uid=1001 --home-dir=/home/${USER} --shell=/bin/bash ${USER}; 
 	
 # Install 1C Server
-ADD ./distr/setup-full-${SERVER_VERSION}-x86_64.run /tmp/distr/
-RUN  /tmp/distr/setup-full-${SERVER_VERSION}-x86_64.run  \
+ADD ./distr/setup-full-${SERVER_VERSION}-x86_64.run /tmp/distr/1c/
+ADD ./distr/1c_enterprise_license_tools_0.15.0_2_linux_x86_64.tar.gz /tmp/distr/license/
+RUN  /tmp/distr/1c/setup-full-${SERVER_VERSION}-x86_64.run  \
       --mode unattended \
       --enable-components \
-        server,ws,server_admin,config_storage_server,additional_admin_functions,liberica_jre,integrity_monitoring,v8_install_deps \
-    && rm /tmp/distr/* 
-#Install license tool
-ADD ./distr/1c_enterprise_license_tools_0.15.0_2_linux_x86_64.tar.gz /tmp/
-#RUN /tmp/1ce-installer-cli install --ignore-signature-warnings
+        ws,liberica_jre,v8_install_deps,client_thin_fib \
+      --disable-components \
+        client_full
+
+# RUN rm /tmp/distr/* 
+
+
+RUN /tmp/distr/license/1ce-installer-cli install --ignore-signature-warnings
 
 #COPY ./services.d /etc/services.d 
 COPY ./entrypoint.sh /entrypoint.sh
@@ -71,6 +71,5 @@ ENTRYPOINT [ "/entrypoint.sh" ]
 EXPOSE 1540-1541 1545 1560-1591
 EXPOSE 80 443
 
-VOLUME ${SERVER_DATA}
-VOLUME ${BASE_DIR}
-
+VOLUME ${BASES_DIR}
+VOLUME ${LIC_DIR}