alexvanin/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Update Makefile and docker-compose

Browse source 
* make COMPOSE overrideable
* remove minio trace command from minio init

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
This commit is contained in:
Milos Gajdos 2023-09-26 14:41:42 +01:00
parent 8e630ae2a5
commit 14361b3ab5
No known key found for this signature in database
GPG key ID: 01300E5E6D417439
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -7,6 +7,8 @@ ROOTDIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always) VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
# default compose command
COMPOSE=docker compose
PKG=github.com/distribution/distribution/v3 PKG=github.com/distribution/distribution/v3
@ -126,14 +128,14 @@ start-cloud-storage: ## start local cloud storage (minio)
.PHONY: stop-cloud-storage .PHONY: stop-cloud-storage
stop-cloud-storage: ## stop local cloud storage (minio) stop-cloud-storage: ## stop local cloud storage (minio)
docker compose -f tests/docker-compose-storage.yml down $(COMPOSE) -f tests/docker-compose-storage.yml down
.PHONY: reset-cloud-storage .PHONY: reset-cloud-storage
reset-cloud-storage: ## reset (stop, delete, start) local cloud storage (minio) reset-cloud-storage: ## reset (stop, delete, start) local cloud storage (minio)
docker compose -f tests/docker-compose-storage.yml down $(COMPOSE) -f tests/docker-compose-storage.yml down
@mkdir -p tests/miniodata/distribution @mkdir -p tests/miniodata/distribution
@rm -rf tests/miniodata/distribution/* tests/miniodata/.minio.sys @rm -rf tests/miniodata/distribution/* tests/miniodata/.minio.sys
docker compose -f tests/docker-compose-storage.yml up minio minio-init -d $(COMPOSE) -f tests/docker-compose-storage.yml up minio minio-init -d
.PHONY: run-s3-tests .PHONY: run-s3-tests
run-s3-tests: ## run S3 storage driver integration tests run-s3-tests: ## run S3 storage driver integration tests

2
tests/docker-compose-storage.yml
View file

@ -25,7 +25,7 @@ services:
/bin/bash -c " /bin/bash -c "
/usr/bin/mc config host add minio http://minio:9000 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD} && ( /usr/bin/mc config host add minio http://minio:9000 $${MINIO_ROOT_USER} $${MINIO_ROOT_PASSWORD} && (
/usr/bin/mc stat minio/images-local || /usr/bin/mc mb minio/images-local /usr/bin/mc stat minio/images-local || /usr/bin/mc mb minio/images-local
) && /usr/bin/mc anonymous set public minio/images-local && /usr/bin/mc admin trace --path " ) && /usr/bin/mc anonymous set public minio/images-local"
environment: environment:
MINIO_ROOT_USER: distribution MINIO_ROOT_USER: distribution
MINIO_ROOT_PASSWORD: password MINIO_ROOT_PASSWORD: password