From 7007cb8202c5b96a6da762c1ddcad9101564c7dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A1=D0=B0?= =?UTF-8?q?=D1=84=D1=80=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Wed, 23 Mar 2022 12:51:50 +0300 Subject: [PATCH 1/3] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b3b2d8..acf4ad2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM registry.cyberbrain.pw/docker/alpine:latest +ARG DOCKER_REGISTRY=registry.cyberbrain.pw +FROM $DOCKER_REGISTRY/docker/alpine:latest WORKDIR /tmp/openwrt -- GitLab From e5f9182bdd0c1690fe6c1e73f49f970f11725859 Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Wed, 23 Mar 2022 13:07:18 +0300 Subject: [PATCH 2/3] fix --- .hadolint.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.hadolint.yaml b/.hadolint.yaml index 95c61c4..5462986 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -1,3 +1,4 @@ ignored: + - DL3007 - DL3008 - DL3018 -- GitLab From 0ac32cc833b47af5d12caffbd73b4534a51ea461 Mon Sep 17 00:00:00 2001 From: Dmitriy Safronov Date: Wed, 23 Mar 2022 13:11:14 +0300 Subject: [PATCH 3/3] fix --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index acf4ad2..a6e1cc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ ARG DOCKER_REGISTRY=registry.cyberbrain.pw -FROM $DOCKER_REGISTRY/docker/alpine:latest +FROM $DOCKER_REGISTRY/tools/docker/git:latest WORKDIR /tmp/openwrt ENTRYPOINT [ "sh", "/entrypoint.sh" ] RUN set -ex && \ - apk --no-cache add sudo git rsync openssh-client && \ + apk --no-cache add sudo rsync && \ rm -rf /var/cache/apk/* && \ addgroup -S openwrt && \ adduser -S openwrt -G openwrt -h /home/openwrt && \ -- GitLab