diff --git a/.env b/.env index 0d8260c..105d11a 100644 --- a/.env +++ b/.env @@ -1,3 +1,8 @@ FROSTFS_HUB_IMAGE=truecloudlab/frostfs AIO_IMAGE=truecloudlab/frostfs-aio 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 diff --git a/Dockerfile b/Dockerfile index 54c2662..af20a42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs ARG NEOGO_HUB_IMAGE=nspccdev/neo-go -ARG FROSTFS_CORE_TAG=0.42.15 -ARG FROSTFS_HTTP_GATE_TAG=0.30.2 -ARG FROSTFS_S3_GATE_TAG=0.30.7 -ARG NEOGO_TAG=0.106.0 +ARG FROSTFS_CORE_TAG=dev +ARG FROSTFS_HTTP_GATE_TAG=dev +ARG FROSTFS_S3_GATE_TAG=dev +ARG NEOGO_TAG=dev FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} AS neo-go FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} AS frostfs-adm diff --git a/Dockerfile.custom b/Dockerfile.custom index 92d4618..ad30355 100644 --- a/Dockerfile.custom +++ b/Dockerfile.custom @@ -1,10 +1,10 @@ ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs ARG NEOGO_HUB_IMAGE=nspccdev/neo-go -ARG FROSTFS_CORE_TAG=0.42.15 -ARG FROSTFS_HTTP_GATE_TAG=0.30.2 -ARG FROSTFS_S3_GATE_TAG=0.30.7 -ARG NEOGO_TAG=0.106.0 +ARG FROSTFS_CORE_TAG +ARG FROSTFS_HTTP_GATE_TAG +ARG FROSTFS_S3_GATE_TAG +ARG NEOGO_TAG FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} AS neo-go FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} AS frostfs-adm diff --git a/Makefile b/Makefile index d1ce2bc..abe06f1 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,10 @@ image-aio: @docker build \ --rm \ -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) . # Build aio Docker image from all local pre-built binaries @@ -39,6 +43,10 @@ image-aio-local: @docker build \ --rm \ -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) . # Build aio Docker image with custom binaries @@ -47,6 +55,10 @@ image-aio-custom: @docker build \ --rm \ -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) . # Start AIO @@ -115,9 +127,11 @@ balance: # Show current version version: - @echo $(VERSION) - @echo "frostfs-node: $(AIO_VERSION)" - @echo "neo-go: $(NEOGO_VERSION)" + @echo "aio:" $(VERSION) + @echo "frostfs-node: $(FROSTFS_CORE_TAG)" + @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 logs/%: