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.

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

Clean development files #128

Merged
merged 5 commits into from
Jan 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 0 additions & 44 deletions .devcontainer/Dockerfile

This file was deleted.

27 changes: 0 additions & 27 deletions .devcontainer/devcontainer.json

This file was deleted.

4 changes: 1 addition & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
go-version: 1.16.x
id: go
- name: Build the docker-compose stack
run: docker-compose -f test-compose.yml up -d
run: docker-compose up -d minio
- uses: hashicorp/setup-terraform@v1
with:
terraform_version: 0.14.0
Expand All @@ -52,5 +52,3 @@ jobs:
run: task install
- name: Run test task
run: task test
- name: Remove containers
run: docker rm -f minio
40 changes: 20 additions & 20 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
image:
file: .devcontainer/Dockerfile

tasks:
- command: minio server ${MINIO_VOLUMES}
name: MinIO Server
- command: adminio
name: AdminIO Server
- command: |
sed -i 's/apiMultiBackend = true/apiMultiBackend = false/' ${ADMINIO_UI_PATH}/env.js &&
sed -i 's/apiBaseUrl = "http:\/\/localhost:8080"/apiBaseUrl = `https:\/\/8080${location.hostname.substr(4)}`/' ${ADMINIO_UI_PATH}/env.js &&
npx --yes angular-http-server -p ${ADMINIO_UI_PORT} --path ${ADMINIO_UI_PATH}
name: AdminIO-UI Server
- command: |
cd $(mktemp -d) &&
go mod init task &&
go get github.com/go-task/task/v3/cmd/task &&
cd - &&
- command: >
export DOCKER_COMPOSE_GITPOD_PATH=/tmp/docker-compose.gitpod.yml &&
cp docker-compose.yml ${DOCKER_COMPOSE_GITPOD_PATH} &&
sed -i 's/http:\/\/localhost:8080/$API_BASE_URL/g' ${DOCKER_COMPOSE_GITPOD_PATH} &&
export API_BASE_URL=`gp url 8080` &&
docker-compose -f ${DOCKER_COMPOSE_GITPOD_PATH} up
- env:
TERRAFORM_VERSION: 0.14.0
command: >
export TERRAFORM_DOWNLOAD_FILE_NAME=terraform_${TERRAFORM_VERSION}_linux_amd64.zip &&
wget https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/${TERRAFORM_DOWNLOAD_FILE_NAME} &&
unzip ${TERRAFORM_DOWNLOAD_FILE_NAME} &&
rm ${TERRAFORM_DOWNLOAD_FILE_NAME} &&
sudo mv terraform /usr/local/bin/terraform &&
sudo sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin &&
task install
name: Terminal

ports:
- port: 9000
name: MinIO Server
onOpen: ignore
- port: 8080
name: AdminIO Server
- port: 1234
name: AdminIO-UI Server
onOpen: ignore
- port: 8000
name: AdminIO-UI Server
onOpen: open-preview
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
- [Examples](#examples)
- [Testing](#testing)
- [Usage](#usage)
- [Developing inside a container](#developing-inside-a-container)
- [Roadmap](#roadmap)
- [License](#license)
- [Acknowledgements](#acknowledgements)
Expand All @@ -60,7 +59,7 @@ Prebuilt versions of this provider are available for MacOS and Linux on the [rel
But if you need to build it yourself, just download this repository, [install](https://taskfile.dev/#/installation) [Task](https://taskfile.dev/):

```sh
go get github.com/go-task/task/v3/cmd/task
go install github.com/go-task/task/v3/cmd/task@latest
```

And run the following command to build and install the plugin in the correct folder (resolved automatically based on the current Operating System):
Expand Down Expand Up @@ -114,16 +113,12 @@ 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.
Access http://localhost:8000 on your browser, apply your terraform templates and watch them going live.

## Usage

See our [Examples](examples/) folder.

## Developing inside a container

Inside `.devcontainer` folder is the configuration of a Docker Container with all tools needed to develop this project. It's meant to be used with [VS Code](https://code.visualstudio.com), requiring only the installation of [Remote - Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension. For usage instructions, refer to [this tutorial](https://code.visualstudio.com/docs/remote/containers).

## Roadmap

See the [open issues](https://github.com/aminueza/terraform-provider-minio/issues) for a list of proposed features (and known issues). See [CONTRIBUTING.md](./CONTRIBUTING.md) for more information.
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
MINIO_SECRET_KEY: minio123
command: server /data{0...3}
adminio-ui:
image: rzrbld/adminio-ui:release-1.7
image: rzrbld/adminio-ui:v1.93
environment:
API_BASE_URL: "http://localhost:8080"
ADMINIO_MULTI_BACKEND: "false"
Expand All @@ -18,7 +18,7 @@ services:
ports:
- "8000:80"
adminio-api:
image: rzrbld/adminio-api:release-1.6
image: rzrbld/adminio-api:v1.82
environment:
MINIO_ACCESS: minio
MINIO_SECRET: minio123
Expand Down
13 changes: 0 additions & 13 deletions test-compose.yml

This file was deleted.