From c4fd21607fa01552b98b080d1816dbf9a04fbfee Mon Sep 17 00:00:00 2001 From: Lou Bichard Date: Sun, 15 Jan 2023 17:38:15 +0000 Subject: [PATCH 1/5] feat: add devcontainer --- .devcontainer.json | 5 +++++ Dockerfile | 1 + 2 files changed, 6 insertions(+) create mode 100644 .devcontainer.json create mode 100644 Dockerfile diff --git a/.devcontainer.json b/.devcontainer.json new file mode 100644 index 0000000..06ac454 --- /dev/null +++ b/.devcontainer.json @@ -0,0 +1,5 @@ +{ + "name": "Node.js Sample", + "dockerFile": "Dockerfile", + "postCreateCommand": "echo 'hello world'" +} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ee5bbae --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +FROM node:16 From 35589ad9af6655bad885f3002795b4aae2ac1393 Mon Sep 17 00:00:00 2001 From: Lou Bichard Date: Sun, 15 Jan 2023 17:46:44 +0000 Subject: [PATCH 2/5] fix: added tasks.json --- .vscode/tasks.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .vscode/tasks.json diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..34c74d8 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,10 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Test Terminal", + "type": "shell", + "command": "echo hello" + } + ] +} \ No newline at end of file From 75a506c0e61a2b1fb0043fad77e78596df4154ab Mon Sep 17 00:00:00 2001 From: Lou Bichard Date: Sun, 15 Jan 2023 18:13:54 +0000 Subject: [PATCH 3/5] fix: adding basic devcontainer --- .devcontainer.json | 3 ++- main.sh | 12 ++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.devcontainer.json b/.devcontainer.json index 06ac454..1979235 100644 --- a/.devcontainer.json +++ b/.devcontainer.json @@ -1,5 +1,6 @@ { "name": "Node.js Sample", "dockerFile": "Dockerfile", - "postCreateCommand": "echo 'hello world'" + "remoteUser": "root", + "postCreateCommand": "./main.sh" } \ No newline at end of file diff --git a/main.sh b/main.sh index 12f38c3..24d6175 100755 --- a/main.sh +++ b/main.sh @@ -1,8 +1,12 @@ #!/bin/bash -source ./setup-env-variables.sh -./install-aws-cli.sh -./collect-credentials.sh -./open-cloud-dashboards.sh +source ./install-terraform.sh +source ./install-aws-cli.sh source ./install-kubectl.sh source ./install-terraform.sh +source ./install-kubectl.sh +source ./install-vsextensions.sh + +source ./setup-env-variables.sh +source ./collect-credentials.sh +source ./open-cloud-dashboards.sh From 07044210ef4ea1eb233fabdb3bd593f611d99c1e Mon Sep 17 00:00:00 2001 From: Lou Bichard Date: Sun, 15 Jan 2023 19:47:25 +0000 Subject: [PATCH 4/5] fix: updated permissions --- .gitpod.yml | 1 + Dockerfile | 2 +- README.md | 20 +++++++++++++++++--- install-kubectl.sh | 0 install-terraform.sh | 0 install-vsextensions.sh | 0 main.sh | 18 +++++++++--------- 7 files changed, 28 insertions(+), 13 deletions(-) mode change 100644 => 100755 install-kubectl.sh mode change 100644 => 100755 install-terraform.sh mode change 100644 => 100755 install-vsextensions.sh diff --git a/.gitpod.yml b/.gitpod.yml index c083eb5..7a60635 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,3 +1,4 @@ +image: Dockerfile tasks: - name: Setup environment variables command: | diff --git a/Dockerfile b/Dockerfile index ee5bbae..65de703 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1 +1 @@ -FROM node:16 +FROM gitpod/workspace-full diff --git a/README.md b/README.md index 077c2eb..16f7e47 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,23 @@ Open Cloud Dev Box is a project that makes learning cloud faster, easier and saf ## Getting Started -- [Open in Gitpod](https://gitpod.io/#github.com/openupthecloud/open-cloud-dev-box) -- Open in Codespaces (coming soon) -- Open locally (coming soon) +## Getting Started + +### With Gitpod + +1. Create Gitpod account. +2. [Open in Gitpod](https://gitpod.io/#github.com/openupthecloud/open-cloud-dev-box) (Or click: [gitpod.io/#https://github.com/openupthecloud/open-cloud-dev-box](https://github.com/openupthecloud/open-cloud-dev-box)) +3. Type `aws` (or any other supported CLI or tool) into the terminal to verify + +### With Codespaces + +1. Create a GitHub account +2. Go to: github.com/codespaces and start a new Codespace based on the project +3. Type `aws` (or any other supported CLI or tool) into the terminal to verify + +### Locally + +Coming soon! ## Compatibilities diff --git a/install-kubectl.sh b/install-kubectl.sh old mode 100644 new mode 100755 diff --git a/install-terraform.sh b/install-terraform.sh old mode 100644 new mode 100755 diff --git a/install-vsextensions.sh b/install-vsextensions.sh old mode 100644 new mode 100755 diff --git a/main.sh b/main.sh index 24d6175..33ec407 100755 --- a/main.sh +++ b/main.sh @@ -1,12 +1,12 @@ #!/bin/bash -source ./install-terraform.sh -source ./install-aws-cli.sh -source ./install-kubectl.sh -source ./install-terraform.sh -source ./install-kubectl.sh -source ./install-vsextensions.sh +./install-terraform.sh +./install-aws-cli.sh +./install-kubectl.sh +./install-terraform.sh +./install-kubectl.sh +./install-vsextensions.sh -source ./setup-env-variables.sh -source ./collect-credentials.sh -source ./open-cloud-dashboards.sh +./setup-env-variables.sh +./collect-credentials.sh +./open-cloud-dashboards.sh From 4fe18d65e8813194c41bc002ecb91d11eb782300 Mon Sep 17 00:00:00 2001 From: Lou Bichard Date: Sun, 15 Jan 2023 20:16:41 +0000 Subject: [PATCH 5/5] fix: removed tasks.json --- .devcontainer.json | 1 - .vscode/tasks.json | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 .vscode/tasks.json diff --git a/.devcontainer.json b/.devcontainer.json index 1979235..60402ac 100644 --- a/.devcontainer.json +++ b/.devcontainer.json @@ -1,5 +1,4 @@ { - "name": "Node.js Sample", "dockerFile": "Dockerfile", "remoteUser": "root", "postCreateCommand": "./main.sh" diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 34c74d8..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "Test Terminal", - "type": "shell", - "command": "echo hello" - } - ] -} \ No newline at end of file