Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use upstream Minio Docker image #64

Merged
merged 1 commit into from
Oct 5, 2020
Merged

Use upstream Minio Docker image #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ jobs:
environment:
POSTGRES_DB: django
POSTGRES_PASSWORD: postgres
- image: girder/minio-nonroot:latest
- image: minio/minio:latest
command: server /data
environment:
MINIO_ACCESS_KEY: minioAccessKey
MINIO_SECRET_KEY: minioSecretKey
steps:
- checkout
- run:
Expand All @@ -23,8 +27,8 @@ jobs:
environment:
DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
DJANGO_MINIO_STORAGE_ACCESS_KEY: minioUserAccessKey
DJANGO_MINIO_STORAGE_SECRET_KEY: minioUserSecretKey
DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
working_directory: my-new-project
workflows:
version: 2
Expand Down
10 changes: 7 additions & 3 deletions {{ cookiecutter.project_slug }}/.circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ jobs:
environment:
POSTGRES_DB: django
POSTGRES_PASSWORD: postgres
- image: girder/minio-nonroot:latest
- image: minio/minio:latest
command: server /data
environment:
MINIO_ACCESS_KEY: minioAccessKey
MINIO_SECRET_KEY: minioSecretKey
steps:
- checkout
- run:
Expand All @@ -20,8 +24,8 @@ jobs:
environment:
DJANGO_DATABASE_URL: postgres://postgres:postgres@localhost:5432/django
DJANGO_MINIO_STORAGE_ENDPOINT: localhost:9000
DJANGO_MINIO_STORAGE_ACCESS_KEY: minioUserAccessKey
DJANGO_MINIO_STORAGE_SECRET_KEY: minioUserSecretKey
DJANGO_MINIO_STORAGE_ACCESS_KEY: minioAccessKey
DJANGO_MINIO_STORAGE_SECRET_KEY: minioSecretKey
workflows:
version: 2
ci:
Expand Down
4 changes: 2 additions & 2 deletions {{ cookiecutter.project_slug }}/dev/.env.docker-compose
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ DJANGO_CONFIGURATION=DevelopmentConfiguration
DJANGO_DATABASE_URL=postgres://postgres:postgres@postgres:5432/django
DJANGO_CELERY_BROKER_URL=amqp://rabbitmq:5672/
DJANGO_MINIO_STORAGE_ENDPOINT=minio:9000
DJANGO_MINIO_STORAGE_ACCESS_KEY=minioUserAccessKey
DJANGO_MINIO_STORAGE_SECRET_KEY=minioUserSecretKey
DJANGO_MINIO_STORAGE_ACCESS_KEY=minioAccessKey
DJANGO_MINIO_STORAGE_SECRET_KEY=minioSecretKey
DJANGO_STORAGE_BUCKET_NAME=django-storage
DJANGO_MINIO_STORAGE_MEDIA_URL=http://localhost:9000/django-storage
4 changes: 2 additions & 2 deletions {{ cookiecutter.project_slug }}/dev/.env.docker-compose-native
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ DJANGO_CONFIGURATION=DevelopmentConfiguration
DJANGO_DATABASE_URL=postgres://postgres:postgres@localhost:5432/django
DJANGO_CELERY_BROKER_URL=amqp://localhost:5672/
DJANGO_MINIO_STORAGE_ENDPOINT=localhost:9000
DJANGO_MINIO_STORAGE_ACCESS_KEY=minioUserAccessKey
DJANGO_MINIO_STORAGE_SECRET_KEY=minioUserSecretKey
DJANGO_MINIO_STORAGE_ACCESS_KEY=minioAccessKey
DJANGO_MINIO_STORAGE_SECRET_KEY=minioSecretKey
DJANGO_STORAGE_BUCKET_NAME=django-storage
6 changes: 5 additions & 1 deletion {{ cookiecutter.project_slug }}/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ services:
- ${DOCKER_RABBITMQ_PORT-5672}:5672

minio:
image: girder/minio-nonroot:latest
image: minio/minio:latest
# When run with a TTY, minio prints credentials on startup
tty: true
command: ["server", "/data"]
environment:
MINIO_ACCESS_KEY: minioAccessKey
MINIO_SECRET_KEY: minioSecretKey
ports:
- ${DOCKER_MINIO_PORT-9000}:9000