Выполнены задачи:

- Заданы более общие имена тэгов источника для построения образа.
- Задан файл шаблона настроек для ibsrv.
Исправлены ошибки:
- Ошибка инициализации файловой базы для сервиса ibsrv.

docker/1c/build/.arg.tmpl

@@ -1,6 +1,6 @@
 ## OS options
 
-JDK_TAG="${JDK_TAG}"
+OS_TAG="${OS_TAG}"
 
 ## 1C options
 

docker/1c/build/docker-build.sh

@@ -2,7 +2,7 @@
 
 docker build \
   --build-arg "REGISTRY=${REGISTRY}" \
-  --build-arg "JDK_TAG=${JDK_TAG}" \
+  --build-arg "OS_TAG=${OS_TAG}" \
   --build-arg "OC_VERSION=${OC_VERSION}" \
   --build-arg "OC_MODE=${OC_MODE}" \
   --build-context context=context \

docker/1c/build/dockerfile

@@ -1,8 +1,8 @@
 ARG REGISTRY= \
-    JDK_TAG=debian:bookworm-slim
+    OS_TAG=debian:bookworm-slim
 
 # hadolint ignore=DL3006
-FROM "${REGISTRY}${JDK_TAG}"
+FROM "${REGISTRY}${OS_TAG}"
 
 # hadolint ignore=SC1091
 RUN --mount=from=context,target=/context \

docker/1c/build/entrypoint.sh

@@ -215,9 +215,6 @@ init_ibsrv_config() {
             mkdir -p "${OC_IBSRV_FILE_BASE_PATH}"
             chown usr1cv8:grp1cv8 "${OC_IBSRV_FILE_BASE_PATH}"
             gosu usr1cv8 ibcmd infobase create --database-path="${OC_IBSRV_FILE_BASE_PATH}"
-            if [ ! -f "${OC_IBSRV_FILE_BASE_PATH}" ]; then
-                gosu usr1cv8 ibcmd infobase create --database-path="${OC_IBSRV_FILE_BASE_PATH}"
-            fi;
         else
             chown -R usr1cv8:grp1cv8 "${OC_IBSRV_FILE_BASE_PATH}"
         fi;

docker/1c/compose/ibsrv/.env.tmpl

@@ -0,0 +1,18 @@
+## OC IB Server compose options
+
+OC_IBSRV_NAME="${OC_IBSRV_NAME:-oc_ibsrv}"
+OC_IBSRV_TAG="${OC_IBSRV_TAG}"
+OC_IBSRV_HOSTNAME="${OC_IBSRV_HOSTNAME}"
+
+OC_IBSRV_CONFIG_PATH=${OC_IBSRV_CONFIG_PATH:-/srv/1c/ibsrv/config_ibsrv.yml}
+OC_IBSRV_BASE_NAME=${OC_IBSRV_BASE_NAME:-ibsrv}
+OC_IBSRV_HTTP_PORT=${OC_IBSRV_HTTP_PORT:-8314}
+OC_IBSRV_HTTP_BASE_NAME=${OC_IBSRV_HTTP_BASE_NAME:-/ibsrv}
+OC_IBSRV_DEBUG=${OC_IBSRV_DEBUG:-tcp}
+
+
+OC_IBSRV_HTTP_PORT="${OC_IBSRV_HTTP_PORT:-8314}"
+OC_IBSRV_PORT="${OC_IBSRV_PORT:-1541}"
+OC_IBSRV_DEBUG_PORT="${OC_IBSRV_DEBUG_PORT:-1550}"
+OC_IBSRV_RANGE_PORT="${OC_IBSRV_RANGE_PORT:-1560-1591}"
+OC_IBSRV_DATA_VOL="${OC_IBSRV_DATA_VOL:-oc_ibsrv_data}"

docker/1c/compose/ibsrv/docker-compose.yml

@@ -8,25 +8,25 @@ services:
 
     # main
     image: ${OC_IBSRV_TAG}
-    hostname: ${OC_SERVER_HOSTNAME}
+    hostname: ${OC_IBSRV_HOSTNAME}
     command: ibsrv
 
     environment:
       TZ: ${TZ}
-      OC_IBSRV_CONFIG_PATH: /srv/1c/ibsrv/config_ibsrv.yml
-      OC_IBSRV_BASE_NAME: ${OC_IBSRV_BASE_NAME}
-      OC_IBSRV_HTTP_PORT: ${OC_IBSRV_HTTP_PORT}"
-      OC_IBSRV_HTTP_BASE_NAME: ${OC_IBSRV_HTTP_BASE_NAME}
-      OC_IBSRV_DEBUG: ${OC_IBSRV_BASE_NAME:-tcp}
+      OC_IBSRV_CONFIG_PATH: ${OC_IBSRV_CONFIG_PATH:-/srv/1c/ibsrv/config_ibsrv.yml}
+      OC_IBSRV_BASE_NAME: ${OC_IBSRV_BASE_NAME:-ibsrv}
+      OC_IBSRV_HTTP_PORT: ${OC_IBSRV_HTTP_PORT:-8314}
+      OC_IBSRV_HTTP_BASE_NAME: ${OC_IBSRV_HTTP_BASE_NAME:-/ibsrv}
+      OC_IBSRV_DEBUG: ${OC_IBSRV_DEBUG:-tcp}
     ports:
-      - "${OC_IBSRV_HTTP_PORT}:${OC_IBSRV_HTTP_PORT}"
-      - "${OC_RMNGR_PORT}:1541"
-      - "1550:1550"
-      - "${OC_RPHOST_PORT}-1591:1560-1591"
+      - "${OC_IBSRV_HTTP_PORT:-8314}:8314"
+      - "${OC_IBSRV_PORT:-1541}:1541"
+      - "${OC_IBSRV_DEBUG_PORT:-1550}:1550"
+      - "${OC_IBSRV_RANGE_PORT:-1560-1591}:1560-1591"
     volumes:
       - oc_ibsrv_data:/srv/1c/ibsrv
   
 volumes:
   oc_ibsrv_data:
     external: true
-    name: ${IBSRV_DATA_VOL}
+    name: ${OC_IBSRV_DATA_VOL}

docker/1cans/build/.arg.tmpl

@@ -1,6 +1,6 @@
 ## OS options
 
-JDK_TAG="${JDK_TAG}"
+OS_TAG="${OS_TAG}"
 
 ## ANS options
 

docker/1cans/build/docker-build.sh

@@ -2,7 +2,7 @@
 
 docker build \
     --build-arg "REGISTRY=${REGISTRY}" \
-    --build-arg "JDK_TAG=${JDK_TAG}" \
+    --build-arg "OS_TAG=${OS_TAG}" \
     --build-arg "OC_ANS_VERSION=${OC_ANS_VERSION}" \
     --build-context common_context=../../common_context/build \
     --build-context "context_arg=${CONTEXT_ARG}" \

docker/1cans/build/dockerfile

@@ -1,8 +1,8 @@
 ARG REGISTRY= \
-    JDK_TAG=debian:bookworm-slim
+    OS_TAG=debian:bookworm-slim
 
 # hadolint ignore=DL3006
-FROM "${REGISTRY}${JDK_TAG}"
+FROM "${REGISTRY}${OS_TAG}"
 
 ARG OC_ANS_VERSION
 

docker/1cesb/build/.arg.tmpl

@@ -1,6 +1,6 @@
 ## OS options
 
-JDK_TAG="${JDK_TAG}"
+OS_TAG="${OS_TAG}"
 
 ## ESB options
 

docker/1cesb/build/docker-build.sh

@@ -2,7 +2,7 @@
 
 docker build \
     --build-arg "REGISTRY=${REGISTRY}" \
-    --build-arg "JDK_TAG=${JDK_TAG}" \
+    --build-arg "OS_TAG=${OS_TAG}" \
     --build-arg "OC_ESB_TYPE=${OC_ESB_TYPE}" \
     --build-arg "OC_ESB_VERSION=${OC_ESB_VERSION}" \
     --build-context common_context=../../common_context/build \

docker/1cesb/build/dockerfile

@@ -1,8 +1,8 @@
 ARG REGISTRY= \
-    JDK_TAG=debian:bookworm-slim
+    OS_TAG=debian:bookworm-slim
 
 # hadolint ignore=DL3006
-FROM "${REGISTRY}${JDK_TAG}"
+FROM "${REGISTRY}${OS_TAG}"
 
 ARG OC_ESB_VERSION \
     OC_ESB_TYPE=esb