diff --git a/Dockerfile b/Dockerfile index 1449c27..4836ea7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,12 @@ -FROM ubuntu:24.04 - -ENV DEBIAN_FRONTEND=noninteractive +FROM docker:dind # среда -RUN apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ - git \ - && rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache git # nodejs -RUN apt-get update && apt-get install -y --no-install-recommends \ - nodejs \ - && rm -rf /var/lib/apt/lists/* - -# docker -ENV DOCKER_BUILDKIT=1 -RUN apt-get update && apt-get install -y --no-install-recommends \ - docker-cli \ - && rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache nodejs npm # check RUN git --version && \ docker --version && \ node --version - -ENV DEBIAN_FRONTEND= -ENTRYPOINT ["/bin/bash"] diff --git a/Makefile b/Makefile index adcd747..08f7f61 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: build upload build: - docker build -t code.nogamenolife.ru/vault/docker-node:test . + docker build -t code.nogamenolife.ru/vault/docker-node:dind4 . upload: build - docker push code.nogamenolife.ru/vault/docker-node:test + docker push code.nogamenolife.ru/vault/docker-node:dind4