mirror of
https://github.com/distribution/distribution.git
synced 2025-04-28 11:25:14 +00:00
Rename cloud make targets to s3 (#4600)
This commit is contained in:
commit
65f455352d
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -37,7 +37,7 @@ jobs:
|
||||
- 1.23.6
|
||||
target:
|
||||
- test-coverage
|
||||
- test-cloud-storage # TODO: rename to test-s3-storage
|
||||
- test-s3-storage
|
||||
- test-azure-storage
|
||||
steps:
|
||||
-
|
||||
|
14
BUILDING.md
14
BUILDING.md
@ -102,15 +102,15 @@ the environment variable `BUILDTAGS`.
|
||||
<dd>Compiles without resumable digest support</dd>
|
||||
</dl>
|
||||
|
||||
### Local cloud storage environment
|
||||
### Local S3 store environment
|
||||
|
||||
You can run an S3 API compatible storage locally with [minio](https://min.io/).
|
||||
You can run an S3 API compatible store locally with [minio](https://min.io/).
|
||||
|
||||
You must have a [docker compose](https://docs.docker.com/compose/) compatible tool installed on your workstation.
|
||||
|
||||
Start the local cloud environment:
|
||||
Start the local S3 store environment:
|
||||
```
|
||||
make start-cloud-storage
|
||||
make start-s3-storage
|
||||
```
|
||||
There is a sample registry configuration file that lets you point the registry to the started storage:
|
||||
```
|
||||
@ -121,9 +121,9 @@ AWS_ACCESS_KEY=distribution \
|
||||
S3_ENCRYPT=false \
|
||||
REGION_ENDPOINT=http://127.0.0.1:9000 \
|
||||
S3_SECURE=false \
|
||||
./bin/registry serve tests/conf-local-cloud.yml
|
||||
./bin/registry serve tests/conf-local-s3.yml
|
||||
```
|
||||
Stop the local storage when done:
|
||||
Stop the local S3 store when done:
|
||||
```
|
||||
make stop-cloud-storage
|
||||
make stop-s3-storage
|
||||
```
|
||||
|
18
Makefile
18
Makefile
@ -122,26 +122,26 @@ test-coverage: ## run unit tests and generate test coverprofiles
|
||||
fi; \
|
||||
done )
|
||||
|
||||
.PHONY: test-cloud-storage
|
||||
test-cloud-storage: start-cloud-storage run-s3-tests stop-cloud-storage ## run cloud storage driver tests
|
||||
.PHONY: test-s3-storage
|
||||
test-s3-storage: start-s3-storage run-s3-tests stop-s3-storage ## run s3 storage driver tests
|
||||
|
||||
.PHONY: start-cloud-storage
|
||||
start-cloud-storage: ## start local cloud storage (minio)
|
||||
.PHONY: start-s3-storage
|
||||
start-s3-storage: ## start local s3 storage (minio)
|
||||
$(COMPOSE) -f tests/docker-compose-storage.yml up minio minio-init -d
|
||||
|
||||
.PHONY: stop-cloud-storage
|
||||
stop-cloud-storage: ## stop local cloud storage (minio)
|
||||
.PHONY: stop-s3-storage
|
||||
stop-s3-storage: ## stop local s3 storage (minio)
|
||||
$(COMPOSE) -f tests/docker-compose-storage.yml down
|
||||
|
||||
.PHONY: reset-cloud-storage
|
||||
reset-cloud-storage: ## reset (stop, delete, start) local cloud storage (minio)
|
||||
.PHONY: reset-s3-storage
|
||||
reset-s3-storage: ## reset (stop, delete, start) local s3 storage (minio)
|
||||
$(COMPOSE) -f tests/docker-compose-storage.yml down
|
||||
@mkdir -p tests/miniodata/distribution
|
||||
@rm -rf tests/miniodata/distribution/* tests/miniodata/.minio.sys
|
||||
$(COMPOSE) -f tests/docker-compose-storage.yml up minio minio-init -d
|
||||
|
||||
.PHONY: run-s3-tests
|
||||
run-s3-tests: start-cloud-storage ## run S3 storage driver integration tests
|
||||
run-s3-tests: start-s3-storage ## run S3 storage driver integration tests
|
||||
AWS_ACCESS_KEY=distribution \
|
||||
AWS_SECRET_KEY=password \
|
||||
AWS_REGION=us-east-1 \
|
||||
|
Loading…
Reference in New Issue
Block a user