Skip to content

Commit

Permalink
Update development dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
felladrin committed Jan 20, 2022
1 parent 3f82b74 commit 0ab5aac
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 54 deletions.
13 changes: 8 additions & 5 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ARG GO_VERSION="1.16"
ARG GO_VERSION="1.17"

FROM hashicorp/terraform:0.14.0 as terraform
FROM minio/minio:RELEASE.2020-11-25T22-36-25Z as minio
FROM minio/mc:RELEASE.2020-11-25T23-04-07Z-amd64 as mc
FROM rzrbld/adminio-api:release-1.6 as adminio-api
FROM rzrbld/adminio-ui:release-1.7 as adminio-ui
FROM minio/minio:RELEASE.2021-04-06T23-11-00Z as minio
FROM minio/mc:RELEASE.2021-04-22T17-40-00Z as mc
FROM rzrbld/adminio-api:v1.82 as adminio-api
FROM rzrbld/adminio-ui:v1.93 as adminio-ui
FROM mcr.microsoft.com/vscode/devcontainers/go:0-${GO_VERSION}

# Copy and install Terraform binary
Expand Down Expand Up @@ -38,6 +38,9 @@ ENV ADMINIO_UI_PATH=/usr/local/share/adminio-ui
COPY --from=adminio-ui /usr/share/nginx/html ${ADMINIO_UI_PATH}
RUN chmod -R 777 ${ADMINIO_UI_PATH}

# Install Task
RUN go install github.com/go-task/task/v3/cmd/task@latest

# Install Node.js
ARG INSTALL_NODE="true"
ARG NODE_VERSION="lts/*"
Expand Down
41 changes: 16 additions & 25 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
{
"name": "Go",
"build": {
"dockerfile": "Dockerfile"
},
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
"settings": {
"terminal.integrated.shell.linux": "/bin/bash",
"go.useGoProxyToCheckForToolUpdates": false,
"go.useLanguageServer": true,
"go.gopath": "/go",
"go.goroot": "/usr/local/go",
"go.toolsGopath": "/go/bin"
},
"extensions": [
"golang.Go",
"hashicorp.terraform"
],
"remoteUser": "vscode",
"postStartCommand": "go get github.com/go-task/task/v3/cmd/task && task install && minio server ${MINIO_VOLUMES} & adminio & npx angular-http-server -p ${ADMINIO_UI_PORT} --path ${ADMINIO_UI_PATH} &",
"forwardPorts": [
9000,
8080,
1234
]
"name": "Go",
"build": {
"dockerfile": "Dockerfile"
},
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
"settings": {
"go.useGoProxyToCheckForToolUpdates": false,
"go.useLanguageServer": true,
"go.gopath": "/go",
"go.goroot": "/usr/local/go",
"go.toolsGopath": "/go/bin"
},
"extensions": ["golang.Go", "hashicorp.terraform"],
"remoteUser": "vscode",
"postStartCommand": "task install && minio server ${MINIO_VOLUMES} & adminio & npx angular-http-server -p ${ADMINIO_UI_PORT} --path ${ADMINIO_UI_PATH} &",
"forwardPorts": [9000, 8080, 1234]
}

2 changes: 1 addition & 1 deletion .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
- uses: hashicorp/setup-terraform@v1
with:
terraform_version: 0.14.0
Expand Down
12 changes: 5 additions & 7 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@ tasks:
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 - &&
task install
- command: task install
name: Terminal

ports:
- port: 9000
name: MinIO Server
onOpen: ignore
- port: 8080
name: AdminIO Server
onOpen: ignore
- port: 1234
name: AdminIO-UI Server
name: AdminIO-UI Server
onOpen: open-preview
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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
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.

0 comments on commit 0ab5aac

Please sign in to comment.