Skip to content

Commit

Permalink
Update docker-compose.yml and its instructions on Readme (#80)
Browse files Browse the repository at this point in the history
* Update docker-compose.yml and its instructions on Readme

* Lock Terraform and MinIO versions to their current ones
  • Loading branch information
felladrin committed Dec 2, 2020
1 parent b5af7dc commit 73a1256
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# [Choice] Go version: 1, 1.15, 1.14
ARG VARIANT="1"

FROM hashicorp/terraform as terraform
FROM minio/minio as minio
FROM hashicorp/terraform:0.13.5 as terraform
FROM minio/minio:RELEASE.2020-11-25T22-36-25Z as minio
FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}

# Copy and install Terraform binary
Expand Down
6 changes: 3 additions & 3 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM minio/minio as minio
FROM hashicorp/terraform as terraform
FROM hashicorp/terraform:0.13.5 as terraform
FROM minio/minio:RELEASE.2020-11-25T22-36-25Z as minio
FROM gitpod/workspace-full

USER gitpod

# Define environment variables for Terraform
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,23 @@ But if you need to build it yourself, just download this repository and follow t
### MacOS

To build and install this plugin on MacOS, run:

```
make install_mac
```

### Linux

To build and install this plugin on Linux, run:

```
make install_linux
```

### Windows

For Windows we don't have a Makefile, but it should be as simple as:

```
go build -o terraform-provider-minio_v1.0.0
mkdir "%APPDATA%\HashiCorp\Terraform\plugins\registry.terraform.io\aminueza\minio\1.0.0\windows_amd64"
Expand Down Expand Up @@ -124,6 +127,8 @@ For testing locally, run the docker compose to spin up a minio server:
docker-compose up
```

Access http://localhost on your browser, apply your terraform templates and watch them going live.

## Usage

See our [Examples](examples/) folder.
Expand Down
22 changes: 13 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
version: '3.7'
version: "3"
services:
minio:
image: minio/minio:RELEASE.2020-02-27T00-23-05Z
hostname: minio
container_name: minio
image: minio/minio:RELEASE.2020-11-25T22-36-25Z
ports:
- "9000:9000"
environment:
MINIO_ACCESS_KEY: minio
MINIO_SECRET_KEY: minio123
MINIO_HTTP_TRACE: /dev/stdout
command: server /data
command: server /data0 /data1 /data2 /data3
adminio-ui:
image: rzrbld/adminio-ui:latest
image: rzrbld/adminio-ui:release-1.7
environment:
API_BASE_URL: "http://localhost:8080"
ADMINIO_MULTI_BACKEND: "false"
ADMINIO_BACKENDS: '[{"name":"myminio","url":"http://localhost:8080"},{"name":"localhost","url":"http://localhost:8081"},{"name":"error","url":"http://localhost:8082"}]'
NGX_ROOT_PATH: "/"
ports:
- "80:80"
adminio-api:
image: aminueza/adminio-api:v2.0
image: rzrbld/adminio-api:release-1.6
environment:
MINIO_ACCESS: minio
MINIO_SECRET: minio123
MINIO_HOST_PORT: minio:9000
MINIO_SSE_MASTER_KEY: 1:da2f4cfa32bed76507dcd44b42872328a8e14f25cd2a1ec0fb85d299a192a447
ADMINIO_HOST_PORT: :8080
depends_on:
- minio
- adminio-ui
ports:
- "8080:8080"
- "8080:8080"

0 comments on commit 73a1256

Please sign in to comment.