Skip to content

Исправил ошибку сборки EDT 2024+ #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nixel2007 merged 1 commit into from
Sep 23, 2025
Merged

Исправил ошибку сборки EDT 2024+ #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions edt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ RUN apt-get update \
&& localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8

# Установка переменных окружения для корректной работы локали
ENV LANG ru_RU.UTF-8
ENV LANGUAGE ru_RU:ru
ENV LC_ALL ru_RU.UTF-8
ENV LANG=ru_RU.UTF-8
ENV LANGUAGE=ru_RU:ru
ENV LC_ALL=ru_RU.UTF-8

RUN /download.sh "$ONEC_USERNAME" "$ONEC_PASSWORD" "$EDT_VERSION" "edt"

Expand Down Expand Up @@ -71,7 +71,9 @@ RUN chmod +x ./1ce-installer-cli \
#1cedtcli отсутствует в EDT версии <2023.1.0
&& if [ -n "$(find /opt/1C/1CE -name 1cedtcli)" ]; then ln -s $(dirname $(find /opt/1C/1CE -name 1cedtcli)) /opt/1C/1CE/components/1cedtcli; fi \
&& rm -rf \
/tmp/*
/tmp/* \
# создадим пустой файл, чтобы не было ошибок на следуюших этапах в случае его отсутствия
&& if [ ! -f /etc/1C/1CE/ring-commands.cfg ]; then touch /etc/1C/1CE/ring-commands.cfg; fi
Comment on lines +74 to +76
Copy link

@coderabbitai coderabbitai bot Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Ensure parent directory exists before touch; fix typo in comment.

If /etc/1C/1CE doesn’t exist in some EDT versions, touch will fail and break the build. Create the directory first. Also correct “следуюших” → “следующих”.

Apply:

-    /tmp/* \
-  # создадим пустой файл, чтобы не было ошибок на следуюших этапах в случае его отсутствия
-  && if [ ! -f /etc/1C/1CE/ring-commands.cfg ]; then touch /etc/1C/1CE/ring-commands.cfg; fi
+    /tmp/* \
+  # создадим пустой файл, чтобы не было ошибок на следующих этапах в случае его отсутствия
+  && mkdir -p /etc/1C/1CE \
+  && if [ ! -f /etc/1C/1CE/ring-commands.cfg ]; then touch /etc/1C/1CE/ring-commands.cfg; fi
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
/tmp/* \
# создадим пустой файл, чтобы не было ошибок на следуюших этапах в случае его отсутствия
&& if [ ! -f /etc/1C/1CE/ring-commands.cfg ]; then touch /etc/1C/1CE/ring-commands.cfg; fi
/tmp/* \
# создадим пустой файл, чтобы не было ошибок на следующих этапах в случае его отсутствия
&& mkdir -p /etc/1C/1CE \
&& if [ ! -f /etc/1C/1CE/ring-commands.cfg ]; then touch /etc/1C/1CE/ring-commands.cfg; fi
🤖 Prompt for AI Agents 
In edt/Dockerfile around lines 74 to 76, the script touches
/etc/1C/1CE/ring-commands.cfg without ensuring its parent directory exists and
the comment contains a typo; update the Dockerfile to first create the directory
if missing (e.g., mkdir -p /etc/1C/1CE) before touching the file, and correct
the comment word “следуюших” to “следующих”.


FROM ${BASE_IMAGE}:${BASE_TAG}

Expand All @@ -93,9 +95,9 @@ RUN apt-get update \
&& localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8

# Установка переменных окружения для корректной работы локали
ENV LANG ru_RU.UTF-8
ENV LANGUAGE ru_RU:ru
ENV LC_ALL ru_RU.UTF-8
ENV LANG=ru_RU.UTF-8
ENV LANGUAGE=ru_RU:ru
ENV LC_ALL=ru_RU.UTF-8

# Copy EDT
COPY --from=installer /opt/1C/1CE /opt/1C/1CE
Expand Down