From 45cd851c467f3e3cb51425a676d76f79d8b27b25 Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Fri, 9 Jul 2021 13:40:18 +0300 Subject: [PATCH] [#666] Add Docker images for neofs-adm Signed-off-by: Stanislav Bogatyrev --- Dockerfile.adm | 22 ++++++++++++++++++++++ Dockerfile.aio | 2 ++ Dockerfile.dirty-adm | 8 ++++++++ Makefile | 4 ++-- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 Dockerfile.adm create mode 100644 Dockerfile.dirty-adm diff --git a/Dockerfile.adm b/Dockerfile.adm new file mode 100644 index 00000000..79734e52 --- /dev/null +++ b/Dockerfile.adm @@ -0,0 +1,22 @@ +FROM golang:1.16-alpine as basebuilder +RUN apk add --update make bash + +FROM basebuilder as builder +ARG BUILD=now +ARG VERSION=dev +ARG REPO=repository +WORKDIR /src +COPY . /src + +RUN make bin/neofs-adm + +# Executable image +FROM alpine AS neofs-adm +RUN apk add --no-cache bash + +WORKDIR / + +COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +COPY --from=builder /src/bin/neofs-adm /bin/neofs-adm + +CMD ["neofs-adm"] diff --git a/Dockerfile.aio b/Dockerfile.aio index 8bca1a81..73cb0ae5 100644 --- a/Dockerfile.aio +++ b/Dockerfile.aio @@ -5,6 +5,7 @@ ARG HUB_TAG=latest FROM ${HUB_IMAGE}-cli:${HUB_TAG} as neofs-cli FROM ${HUB_IMAGE}-ir:${HUB_TAG} as neofs-ir FROM ${HUB_IMAGE}-storage:${HUB_TAG} as neofs-storage +FROM ${HUB_IMAGE}-adm:${HUB_TAG} as neofs-adm # Executable image FROM alpine AS neofs-aio @@ -20,5 +21,6 @@ WORKDIR / COPY --from=neofs-cli /bin/neofs-cli /bin/neofs-cli COPY --from=neofs-ir /bin/neofs-ir /bin/neofs-ir COPY --from=neofs-storage /bin/neofs-node /bin/neofs-node +COPY --from=neofs-adm /bin/neofs-adm /bin/neofs-adm CMD ["neofs-cli"] diff --git a/Dockerfile.dirty-adm b/Dockerfile.dirty-adm new file mode 100644 index 00000000..13a6c55f --- /dev/null +++ b/Dockerfile.dirty-adm @@ -0,0 +1,8 @@ +FROM alpine +RUN apk add --no-cache bash ca-certificates + +WORKDIR / + +COPY bin/neofs-adm /bin/neofs-adm + +CMD ["neofs-adm"] diff --git a/Makefile b/Makefile index 63045173..c48acdf6 100644 --- a/Makefile +++ b/Makefile @@ -83,10 +83,10 @@ image-%: -t $(HUB_IMAGE)-$*:$(HUB_TAG) . # Build all Docker images -images: image-storage image-ir image-cli +images: image-storage image-ir image-cli image-adm # Build dirty local Docker images -dirty-images: image-dirty-storage image-dirty-ir image-dirty-cli +dirty-images: image-dirty-storage image-dirty-ir image-dirty-cli image-dirty-adm # Run all code formatters fmts: fmt imports