KurlesHS/frostfs-aio
1
0
Fork 0
forked from TrueCloudLab/frostfs-aio
Code Pull requests Activity

[#40] Move component versions to .env

Browse source 
Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com>
This commit is contained in:
Nikita Zinkevich 2024-10-17 09:52:51 +03:00
parent 6e4817101d
commit 66273f8790
Signed by: nzinkevich
GPG key ID: 748EA1D0B2E6420A
4 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.env
View file

@ -1,3 +1,8 @@
FROSTFS_HUB_IMAGE=truecloudlab/frostfs FROSTFS_HUB_IMAGE=truecloudlab/frostfs
AIO_IMAGE=truecloudlab/frostfs-aio AIO_IMAGE=truecloudlab/frostfs-aio
AIO_VERSION=1.6.4 AIO_VERSION=1.6.4
FROSTFS_CORE_TAG=0.42.15
FROSTFS_HTTP_GATE_TAG=0.30.2
FROSTFS_S3_GATE_TAG=0.30.7
NEOGO_TAG=0.106.0

8
Dockerfile
View file

@ -1,10 +1,10 @@
ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs
ARG NEOGO_HUB_IMAGE=nspccdev/neo-go ARG NEOGO_HUB_IMAGE=nspccdev/neo-go
ARG FROSTFS_CORE_TAG=0.42.15 ARG FROSTFS_CORE_TAG=dev
ARG FROSTFS_HTTP_GATE_TAG=0.30.2 ARG FROSTFS_HTTP_GATE_TAG=dev
ARG FROSTFS_S3_GATE_TAG=0.30.7 ARG FROSTFS_S3_GATE_TAG=dev
ARG NEOGO_TAG=0.106.0 ARG NEOGO_TAG=dev
FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} AS neo-go FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} AS neo-go
FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} AS frostfs-adm FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} AS frostfs-adm

8
Dockerfile.custom
View file

@ -1,10 +1,10 @@
ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs
ARG NEOGO_HUB_IMAGE=nspccdev/neo-go ARG NEOGO_HUB_IMAGE=nspccdev/neo-go
ARG FROSTFS_CORE_TAG=0.42.15 ARG FROSTFS_CORE_TAG
ARG FROSTFS_HTTP_GATE_TAG=0.30.2 ARG FROSTFS_HTTP_GATE_TAG
ARG FROSTFS_S3_GATE_TAG=0.30.7 ARG FROSTFS_S3_GATE_TAG
ARG NEOGO_TAG=0.106.0 ARG NEOGO_TAG
FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} AS neo-go FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} AS neo-go
FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} AS frostfs-adm FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} AS frostfs-adm

20
Makefile
View file

@ -31,6 +31,10 @@ image-aio:
@docker build \ @docker build \
--rm \ --rm \
-f Dockerfile \ -f Dockerfile \
--build-arg FROSTFS_CORE_TAG=$(FROSTFS_CORE_TAG) \
--build-arg FROSTFS_HTTP_GATE_TAG=$(FROSTFS_HTTP_GATE_TAG) \
--build-arg FROSTFS_S3_GATE_TAG=$(FROSTFS_S3_GATE_TAG) \
--build-arg NEOGO_TAG=$(NEOGO_TAG) \
-t $(AIO_IMAGE):$(AIO_VERSION) . -t $(AIO_IMAGE):$(AIO_VERSION) .
# Build aio Docker image from all local pre-built binaries # Build aio Docker image from all local pre-built binaries
@ -39,6 +43,10 @@ image-aio-local:
@docker build \ @docker build \
--rm \ --rm \
-f Dockerfile.local \ -f Dockerfile.local \
--build-arg FROSTFS_CORE_TAG=$(FROSTFS_CORE_TAG) \
--build-arg FROSTFS_HTTP_GATE_TAG=$(FROSTFS_HTTP_GATE_TAG) \
--build-arg FROSTFS_S3_GATE_TAG=$(FROSTFS_S3_GATE_TAG) \
--build-arg NEOGO_TAG=$(NEOGO_TAG) \
-t $(AIO_IMAGE):$(AIO_VERSION) . -t $(AIO_IMAGE):$(AIO_VERSION) .
# Build aio Docker image with custom binaries # Build aio Docker image with custom binaries
@ -47,6 +55,10 @@ image-aio-custom:
@docker build \ @docker build \
--rm \ --rm \
-f Dockerfile.custom \ -f Dockerfile.custom \
--build-arg FROSTFS_CORE_TAG=$(FROSTFS_CORE_TAG) \
--build-arg FROSTFS_HTTP_GATE_TAG=$(FROSTFS_HTTP_GATE_TAG) \
--build-arg FROSTFS_S3_GATE_TAG=$(FROSTFS_S3_GATE_TAG) \
--build-arg NEOGO_TAG=$(NEOGO_TAG) \
-t $(AIO_IMAGE):$(AIO_VERSION) . -t $(AIO_IMAGE):$(AIO_VERSION) .
# Start AIO # Start AIO
@ -115,9 +127,11 @@ balance:
# Show current version # Show current version
version: version:
@echo $(VERSION) @echo "aio:" $(VERSION)
@echo "frostfs-node: $(AIO_VERSION)" @echo "frostfs-node: $(FROSTFS_CORE_TAG)"
@echo "neo-go: $(NEOGO_VERSION)" @echo "frostfs-s3-gw: $(FROSTFS_S3_GATE_TAG)"
@echo "frostfs-http-gw: $(FROSTFS_HTTP_GATE_TAG)"
@echo "neo-go: $(NEOGO_TAG)"
# Show all logs of the FrostFS service # Show all logs of the FrostFS service
logs/%: logs/%: