From 8b169459274d146724f35bba0e9e870f64f3a90b Mon Sep 17 00:00:00 2001 From: Shaun Hamilton Date: Wed, 27 Aug 2025 08:47:27 +0000 Subject: [PATCH 1/6] migrate: .gitpod.yml -> devcontainer.json --- .devcontainer/devcontainer.json | 22 ++++++++++++++++++++++ .gitpod.yml | 25 ------------------------- .gitpod/automations.yaml | 25 +++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 25 deletions(-) create mode 100644 .devcontainer/devcontainer.json delete mode 100644 .gitpod.yml create mode 100644 .gitpod/automations.yaml diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..656f7415 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,22 @@ +{ + "name": "learn-celestial-bodies-database", + "image": "gitpod/workspace-postgres:2024-01-24-09-19-42", + "features": { + "ghcr.io/devcontainers/features/docker-in-docker:2": { + "installDockerBuildx": false, + "installDockerComposeSwitch": false, + "moby": false + } + }, + "remoteUser": "gitpod", + "containerUser": "gitpod", + "workspaceFolder": "/workspace/learn-celestial-bodies-database", + "workspaceMount": "source=${localWorkspaceFolder},target=/workspace/learn-celestial-bodies-database,type=bind", + "customizations": { + "vscode": { + "extensions": [ + "CodeRoad.coderoad" + ] + } + } +} \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 5f103bb0..00000000 --- a/.gitpod.yml +++ /dev/null @@ -1,25 +0,0 @@ -image: gitpod/workspace-postgres:2024-01-24-09-19-42 - -workspaceLocation: 'project' -checkoutLocation: 'project' - -tasks: - - before: | - sudo cp /workspace/project/.freeCodeCamp/.bashrc ~/.bashrc - sudo cp /workspace/project/.freeCodeCamp/.psqlrc ~/.psqlrc - sudo cp /workspace/project/.freeCodeCamp/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf - sudo touch /workspace/.bash_history - sudo chmod -R 777 /workspace - sudo chown -R postgres:postgres /var/lib/postgresql/12/main - - command: | - sudo rm /workspace/project/CHANGELOG.md - sudo rm /workspace/project/coderoad.yaml - sudo rm /workspace/project/tutorial.json - sudo rm /workspace/project/TUTORIAL.md - pg_stop && sudo service postgresql start && echo "SELECT 'CREATE USER freecodecamp WITH CREATEDB' WHERE NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname='freecodecamp')\gexec" | psql -U postgres -X - exit - -vscode: - extensions: - - CodeRoad.coderoad diff --git a/.gitpod/automations.yaml b/.gitpod/automations.yaml new file mode 100644 index 00000000..bbd45a76 --- /dev/null +++ b/.gitpod/automations.yaml @@ -0,0 +1,25 @@ +tasks: + before-000: + command: | + sudo cp /workspace/project/.freeCodeCamp/.bashrc ~/.bashrc + sudo cp /workspace/project/.freeCodeCamp/.psqlrc ~/.psqlrc + sudo cp /workspace/project/.freeCodeCamp/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf + sudo touch /workspace/.bash_history + sudo chmod -R 777 /workspace + sudo chown -R postgres:postgres /var/lib/postgresql/12/main + description: before task migrated from .gitpod.yml + name: 'Task 0: before' + command-0: + command: | + sudo rm /workspace/project/CHANGELOG.md + sudo rm /workspace/project/coderoad.yaml + sudo rm /workspace/project/tutorial.json + sudo rm /workspace/project/TUTORIAL.md + pg_stop && sudo service postgresql start && echo "SELECT 'CREATE USER freecodecamp WITH CREATEDB' WHERE NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname='freecodecamp')\gexec" | psql -U postgres -X + exit + dependsOn: + - before-000 + description: init task migrated from .gitpod.yml + name: 'Task 0: command' + triggeredBy: + - postDevcontainerStart From 7ea65d72653ff1b1cb98abc740738e338bf9a63f Mon Sep 17 00:00:00 2001 From: Shaun Hamilton Date: Wed, 27 Aug 2025 08:52:57 +0000 Subject: [PATCH 2/6] add .gitpod and .devcontainer to files.exclude --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bc3c8f32..40ff40ce 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -37,7 +37,8 @@ ".gitignore": true, ".freeCodeCamp": true, "learn-celestial-bodies-database": true, - ".gitpod.Dockerfile": true, + ".gitpod": true, + ".devcontainer": true, ".gitpod.yml": true, "CHANGELOG.md": true, "coderoad.yaml": true, From 67b9285b53850fb6495e29412cc80e5a30a5916a Mon Sep 17 00:00:00 2001 From: Shaun Hamilton Date: Wed, 3 Sep 2025 07:10:20 +0000 Subject: [PATCH 3/6] chore: simplify devcontainer (broken) --- .devcontainer/devcontainer.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 656f7415..837612fd 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,15 +1,15 @@ { "name": "learn-celestial-bodies-database", - "image": "gitpod/workspace-postgres:2024-01-24-09-19-42", - "features": { - "ghcr.io/devcontainers/features/docker-in-docker:2": { - "installDockerBuildx": false, - "installDockerComposeSwitch": false, - "moby": false - } - }, - "remoteUser": "gitpod", - "containerUser": "gitpod", + "image": "ghcr.io/devcontainers/templates/javascript-node-postgres:4.0.2", + // "features": { + // "ghcr.io/devcontainers/features/docker-in-docker:2": { + // "installDockerBuildx": false, + // "installDockerComposeSwitch": false, + // "moby": false + // } + // }, + // "remoteUser": "vscode", + // "containerUser": "vscode", "workspaceFolder": "/workspace/learn-celestial-bodies-database", "workspaceMount": "source=${localWorkspaceFolder},target=/workspace/learn-celestial-bodies-database,type=bind", "customizations": { From fdf843d022e49303cf23b24adb1f8bd2c9e4ae36 Mon Sep 17 00:00:00 2001 From: Shaun Hamilton Date: Wed, 3 Sep 2025 08:54:45 +0000 Subject: [PATCH 4/6] use ubuntu base, node+postgres features Co-authored-by: Ona --- .devcontainer/devcontainer.json | 7 ++++++- .gitpod/automations.yaml | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 837612fd..89bd38de 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "learn-celestial-bodies-database", - "image": "ghcr.io/devcontainers/templates/javascript-node-postgres:4.0.2", + "image": "mcr.microsoft.com/devcontainers/base:ubuntu", // "features": { // "ghcr.io/devcontainers/features/docker-in-docker:2": { // "installDockerBuildx": false, @@ -8,6 +8,11 @@ // "moby": false // } // }, + "features": { + "ghcr.io/itsmechlark/features/postgresql:1": { + }, + "ghcr.io/devcontainers/features/node:1": {} + }, // "remoteUser": "vscode", // "containerUser": "vscode", "workspaceFolder": "/workspace/learn-celestial-bodies-database", diff --git a/.gitpod/automations.yaml b/.gitpod/automations.yaml index bbd45a76..e3ce80b4 100644 --- a/.gitpod/automations.yaml +++ b/.gitpod/automations.yaml @@ -23,3 +23,8 @@ tasks: name: 'Task 0: command' triggeredBy: - postDevcontainerStart + coadroad-setup: + command: export CODEROAD_TUTORIAL_URL="https://raw.githubusercontent.com/freeCodeCamp/$(basename "$PWD")/main/tutorial.json" + name: 'CodeRoad Setup' + triggeredBy: + - postEnvironmentStart \ No newline at end of file From 5dae03a5f11dccb1101b5955a8fdb6462ef3aa2f Mon Sep 17 00:00:00 2001 From: Shaun Hamilton Date: Wed, 3 Sep 2025 09:04:46 +0000 Subject: [PATCH 5/6] fix automation path --- .gitpod/automations.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitpod/automations.yaml b/.gitpod/automations.yaml index e3ce80b4..7f259367 100644 --- a/.gitpod/automations.yaml +++ b/.gitpod/automations.yaml @@ -1,9 +1,9 @@ tasks: before-000: command: | - sudo cp /workspace/project/.freeCodeCamp/.bashrc ~/.bashrc - sudo cp /workspace/project/.freeCodeCamp/.psqlrc ~/.psqlrc - sudo cp /workspace/project/.freeCodeCamp/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf + sudo cp /workspace/learn-celestial-bodies-database/.freeCodeCamp/.bashrc ~/.bashrc + sudo cp /workspace/learn-celestial-bodies-database/.freeCodeCamp/.psqlrc ~/.psqlrc + sudo cp /workspace/learn-celestial-bodies-database/.freeCodeCamp/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf sudo touch /workspace/.bash_history sudo chmod -R 777 /workspace sudo chown -R postgres:postgres /var/lib/postgresql/12/main @@ -11,10 +11,10 @@ tasks: name: 'Task 0: before' command-0: command: | - sudo rm /workspace/project/CHANGELOG.md - sudo rm /workspace/project/coderoad.yaml - sudo rm /workspace/project/tutorial.json - sudo rm /workspace/project/TUTORIAL.md + sudo rm /workspace/learn-celestial-bodies-database/CHANGELOG.md + sudo rm /workspace/learn-celestial-bodies-database/coderoad.yaml + sudo rm /workspace/learn-celestial-bodies-database/tutorial.json + sudo rm /workspace/learn-celestial-bodies-database/TUTORIAL.md pg_stop && sudo service postgresql start && echo "SELECT 'CREATE USER freecodecamp WITH CREATEDB' WHERE NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname='freecodecamp')\gexec" | psql -U postgres -X exit dependsOn: @@ -26,5 +26,6 @@ tasks: coadroad-setup: command: export CODEROAD_TUTORIAL_URL="https://raw.githubusercontent.com/freeCodeCamp/$(basename "$PWD")/main/tutorial.json" name: 'CodeRoad Setup' + description: setup env vars triggeredBy: - postEnvironmentStart \ No newline at end of file From 489bacd8d1e34a1ea7065d6a1f2115b3d2b07965 Mon Sep 17 00:00:00 2001 From: Shaun Hamilton Date: Wed, 3 Sep 2025 09:36:31 +0000 Subject: [PATCH 6/6] fix: undo accidental delete --- .devcontainer/devcontainer.json | 1 + .freeCodeCamp/.bashrc | 4 ++-- .vscode/settings.json | 38 ++++++++++++++++----------------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 89bd38de..53c88f40 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -10,6 +10,7 @@ // }, "features": { "ghcr.io/itsmechlark/features/postgresql:1": { + "version": 12 }, "ghcr.io/devcontainers/features/node:1": {} }, diff --git a/.freeCodeCamp/.bashrc b/.freeCodeCamp/.bashrc index c4ba2f67..55960db1 100644 --- a/.freeCodeCamp/.bashrc +++ b/.freeCodeCamp/.bashrc @@ -129,5 +129,5 @@ export PATH="$PATH:$HOME/.rvm/bin" # stuff I added PS1='camper: \[\033[01;34m\]/${PWD##*/}\[\033[00m\]\$ ' HISTFILE=/workspace/.bash_history -PROMPT_COMMAND='echo $PWD >> /workspace/project/.freeCodeCamp/test/.cwd; history -a' -trap 'echo $BASH_COMMAND >> /workspace/project/.freeCodeCamp/test/.next_command' DEBUG \ No newline at end of file +PROMPT_COMMAND='echo $PWD >> /workspace/learn-celestial-bodies-database/.freeCodeCamp/test/.cwd; history -a' +trap 'echo $BASH_COMMAND >> /workspace/learn-celestial-bodies-database/.freeCodeCamp/test/.next_command' DEBUG \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 40ff40ce..8e18f911 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -26,25 +26,25 @@ "explorer.openEditors.visible": 0, "extensions.autoCheckUpdates": false, "extensions.ignoreRecommendations": true, - "files.autoSave": "afterDelay", - "files.exclude": { - "**/.git": true, - "**/.svn": true, - "**/.hg": true, - "**/CVS": true, - "**/.DS_Store": true, - ".vscode": true, - ".gitignore": true, - ".freeCodeCamp": true, - "learn-celestial-bodies-database": true, - ".gitpod": true, - ".devcontainer": true, - ".gitpod.yml": true, - "CHANGELOG.md": true, - "coderoad.yaml": true, - "tutorial.json": true, - "TUTORIAL.md": true - }, + // "files.autoSave": "afterDelay", + // "files.exclude": { + // "**/.git": true, + // "**/.svn": true, + // "**/.hg": true, + // "**/CVS": true, + // "**/.DS_Store": true, + // ".vscode": true, + // ".gitignore": true, + // ".freeCodeCamp": true, + // "learn-celestial-bodies-database": true, + // ".gitpod": true, + // ".devcontainer": true, + // ".gitpod.yml": true, + // "CHANGELOG.md": true, + // "coderoad.yaml": true, + // "tutorial.json": true, + // "TUTORIAL.md": true + // }, "html.autoClosingTags": false, "npm.fetchOnlinePackageInfo": false, "task.slowProviderWarning": false,