From 441fd92165b50229326f2680e868adf22d36b2c7 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Fri, 2 May 2025 21:16:46 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D1=8F=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20?= =?UTF-8?q?=D0=B2=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=20repositories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/apk-builder | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/apk-builder b/docker/apk-builder index 33ca993..95cb693 100644 --- a/docker/apk-builder +++ b/docker/apk-builder @@ -88,6 +88,7 @@ fi if [ -n "$REPOSITORY_LIST" ]; then echo "$REPOSITORY_LIST" | tr ';' '\n' > /etc/apk/repositories; + apk update log success "Репозитории успешно обновлены! 📦" fi From d2ce7960490e22d4357adcca8b90b5df1a24ff5b Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Sat, 3 May 2025 00:19:54 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D1=8F=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5?= =?UTF-8?q?=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/apk-builder | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/apk-builder b/docker/apk-builder index 95cb693..7583ff8 100644 --- a/docker/apk-builder +++ b/docker/apk-builder @@ -86,12 +86,6 @@ if [ -n "$NFS_SERVER" ]; then log success "NFS-сервер $NFS_SERVER:$NFS_PATH успешно смонтирован в $REPOSITORY_DIR на порту $NFS_PORT! 📡" fi -if [ -n "$REPOSITORY_LIST" ]; then - echo "$REPOSITORY_LIST" | tr ';' '\n' > /etc/apk/repositories; - apk update - log success "Репозитории успешно обновлены! 📦" -fi - NAME_KEY="${NAME_KEY:=$BUILDER_USER}" if ! echo "$NAME_KEY" | grep -qE '^[a-zA-Z0-9_-]+$'; then @@ -140,6 +134,12 @@ else fi fi +if [ -n "$REPOSITORY_LIST" ]; then + echo "$REPOSITORY_LIST" | tr ';' '\n' > /etc/apk/repositories; + apk update + log success "Репозитории успешно обновлены! 📦" +fi + su - "$BUILDER_USER" -c " cp -r $SOURCE_DIR/* /home/$BUILDER_USER/package/ || exit 1 cd /home/$BUILDER_USER/package || exit 1 From 2ebd07a1e17905eb5818622d7e2ceac40776b138 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Sat, 3 May 2025 00:49:40 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B4=D0=BE=201.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/Dockerfile.20.10.20 | 2 +- docker/Dockerfile.27.3.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.20.10.20 b/docker/Dockerfile.20.10.20 index d56ef37..c7e9b8e 100644 --- a/docker/Dockerfile.20.10.20 +++ b/docker/Dockerfile.20.10.20 @@ -3,7 +3,7 @@ ARG BASE_IMAGE_VERSION=latest FROM alpine:${BASE_IMAGE_VERSION} LABEL maintainer="Alexander Zhirov " -LABEL version="0.1.0" +LABEL version="1.0.0" LABEL description="Адаптированный для Docker <=20.10.20 образ сборщика APK-файлов для Alpine Linux" ENV BUILDER_USER=builder \ diff --git a/docker/Dockerfile.27.3.1 b/docker/Dockerfile.27.3.1 index 0b491a8..23d84ce 100644 --- a/docker/Dockerfile.27.3.1 +++ b/docker/Dockerfile.27.3.1 @@ -3,7 +3,7 @@ ARG BASE_IMAGE_VERSION=latest FROM alpine:${BASE_IMAGE_VERSION} LABEL maintainer="Alexander Zhirov " -LABEL version="0.1.0" +LABEL version="1.0.0" LABEL description="Адаптированный для Docker >=27.3.1 образ сборщика APK-файлов для Alpine Linux" ENV BUILDER_USER=builder \