From 47a319a766d34d38a4835412826ed97130f2b23e Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Sun, 10 Mar 2024 17:56:34 -0500 Subject: [PATCH 01/20] set up --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 93e1552a..150a5aa5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e0292731..982e09b9 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-buster + VARIANT: 18-bullseye volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100644 new mode 100755 From 7dfe798b8a6890d62f5ddff7671ba72e4baeac59 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Fri, 31 May 2024 15:00:00 -0500 Subject: [PATCH 02/20] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f8123c33..e7dcab73 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ yarn-error.log # below: temporary voyager/static/*.css* voyager/.sst +scoutradioz-utilities/types/utilities.d.ts From cac81638f5491bdde49e24c2e0cfb64998927c20 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Mon, 3 Jun 2024 17:00:25 -0500 Subject: [PATCH 03/20] make 'pit scouting' dropdown full-width and centered --- voyager/src/routes/sync/LeadQRCode.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/voyager/src/routes/sync/LeadQRCode.svelte b/voyager/src/routes/sync/LeadQRCode.svelte index dab98edb..bd96f03b 100644 --- a/voyager/src/routes/sync/LeadQRCode.svelte +++ b/voyager/src/routes/sync/LeadQRCode.svelte @@ -141,9 +141,9 @@
-
-
- @@ -186,4 +186,4 @@
{/if} -
+ \ No newline at end of file From 296c0c0375a20a2502bab7e2584f465a799e7be4 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Tue, 4 Jun 2024 14:11:36 -0500 Subject: [PATCH 04/20] Revert "set up" This reverts commit 47a319a766d34d38a4835412826ed97130f2b23e. --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 150a5aa5..93e1552a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 982e09b9..e0292731 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-bullseye + VARIANT: 18-buster volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100755 new mode 100644 From ff2c59a2393d85a7cb74e54743492014dd234fe5 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Tue, 4 Jun 2024 14:20:04 -0500 Subject: [PATCH 05/20] Reapply "set up" This reverts commit 296c0c0375a20a2502bab7e2584f465a799e7be4. --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 93e1552a..150a5aa5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e0292731..982e09b9 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-buster + VARIANT: 18-bullseye volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100644 new mode 100755 From 8225938e8114ed9578e9f887144c734e406b84cc Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Tue, 4 Jun 2024 23:52:48 -0500 Subject: [PATCH 06/20] Fixes issue #221 Made "my assignments" tab only show the one team you're assigned to --- voyager/src/routes/scouting/match/+page.svelte | 4 ++-- voyager/src/routes/scouting/match/+page.ts | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/voyager/src/routes/scouting/match/+page.svelte b/voyager/src/routes/scouting/match/+page.svelte index 1e4fde1b..8af311aa 100644 --- a/voyager/src/routes/scouting/match/+page.svelte +++ b/voyager/src/routes/scouting/match/+page.svelte @@ -17,7 +17,7 @@ { id: 'all', icon: 'groups', label: 'All' } ]; - $: initialActiveIndex = data.myMatches.length ? 0 : 1; + $: initialActiveIndex = data.myTeams.length ? 0 : 1; const { snackbar } = getPageLayoutContexts(); addRefreshButtonFunctionality(async () => { @@ -52,7 +52,7 @@

- + diff --git a/voyager/src/routes/scouting/match/+page.ts b/voyager/src/routes/scouting/match/+page.ts index b49fb16a..549e0bf9 100644 --- a/voyager/src/routes/scouting/match/+page.ts +++ b/voyager/src/routes/scouting/match/+page.ts @@ -36,6 +36,10 @@ export const load: PageLoad = async ({ fetch, parent, url }) => { const myMatches = grouped.filter(match => match.some(asg => asg.assigned_scorer?.id === user_id) ).slice(0, maxNumMatches); + + const myTeams = myMatches.map(match => + match.filter(asg => asg.assigned_scorer?.id === user_id) + ); const allMatches = grouped.slice(0, maxNumMatches); @@ -49,5 +53,11 @@ export const load: PageLoad = async ({ fetch, parent, url }) => { } let checksum = syncStatus.data.checksum.substring(0, 3) as string; - return { myMatches, allMatches, firstMatchNumber, checksum }; + console.log('Assignments:', assignments); + console.log('Grouped:', grouped); + console.log('My Matches:', myMatches); + console.log('My Team Matches:', myTeams); + console.log('User ID', user_id); + return { myMatches, myTeams, allMatches, firstMatchNumber, checksum }; + }; From 89a16dfa5d66e7ac3ac000ed3f13409a0ba93338 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Tue, 4 Jun 2024 23:54:56 -0500 Subject: [PATCH 07/20] Revert "set up" This reverts commit 47a319a766d34d38a4835412826ed97130f2b23e. --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 150a5aa5..93e1552a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 982e09b9..e0292731 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-bullseye + VARIANT: 18-buster volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100755 new mode 100644 From 162675ae732fdd270bc557734abde3c78c0df6eb Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Wed, 5 Jun 2024 00:15:05 -0500 Subject: [PATCH 08/20] Revert "Reapply "set up"" This reverts commit ff2c59a2393d85a7cb74e54743492014dd234fe5. --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 150a5aa5..93e1552a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 982e09b9..e0292731 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-bullseye + VARIANT: 18-buster volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100755 new mode 100644 From 926b8707ef2c513a2b3a900bcac64abb9987c968 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Wed, 5 Jun 2024 00:15:53 -0500 Subject: [PATCH 09/20] Got rid of all the console logs --- voyager/src/routes/scouting/match/+page.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/voyager/src/routes/scouting/match/+page.ts b/voyager/src/routes/scouting/match/+page.ts index 549e0bf9..dcb0a8f1 100644 --- a/voyager/src/routes/scouting/match/+page.ts +++ b/voyager/src/routes/scouting/match/+page.ts @@ -53,11 +53,6 @@ export const load: PageLoad = async ({ fetch, parent, url }) => { } let checksum = syncStatus.data.checksum.substring(0, 3) as string; - console.log('Assignments:', assignments); - console.log('Grouped:', grouped); - console.log('My Matches:', myMatches); - console.log('My Team Matches:', myTeams); - console.log('User ID', user_id); return { myMatches, myTeams, allMatches, firstMatchNumber, checksum }; }; From 5a7e3711c33c9d69bf1bae01417eee9312fb461a Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Wed, 5 Jun 2024 16:48:00 -0500 Subject: [PATCH 10/20] Reapply "Reapply "set up"" This reverts commit 162675ae732fdd270bc557734abde3c78c0df6eb. --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 93e1552a..150a5aa5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e0292731..982e09b9 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-buster + VARIANT: 18-bullseye volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100644 new mode 100755 From e0966c2b86d0fe1e368fcb2bb0d0eb643fc2e3cc Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Wed, 5 Jun 2024 16:53:49 -0500 Subject: [PATCH 11/20] Reapply "set up" This reverts commit 89a16dfa5d66e7ac3ac000ed3f13409a0ba93338. --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 93e1552a..150a5aa5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e0292731..982e09b9 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-buster + VARIANT: 18-bullseye volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100644 new mode 100755 From 0f4edfa80518c39f31b69f91653f253a728cf447 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Mon, 10 Jun 2024 10:46:21 -0500 Subject: [PATCH 12/20] update 'vite' --- voyager/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voyager/package.json b/voyager/package.json index 6e8d6991..6725e0c7 100644 --- a/voyager/package.json +++ b/voyager/package.json @@ -73,7 +73,7 @@ "svelte-markdown": "^0.4.1", "tailwindcss": "^3.4.1", "typescript": "^5.3.2", - "vite": "^5.1.3", + "vite": "^5.2.12", "workbox-precaching": "^7.0.0", "workbox-routing": "^7.0.0" }, From f93c295c7851e2aa8c54f82356cc4a5140e7d390 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Mon, 10 Jun 2024 10:59:32 -0500 Subject: [PATCH 13/20] Revert "Reapply "set up"" This reverts commit e0966c2b86d0fe1e368fcb2bb0d0eb643fc2e3cc. --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100755 => 100644 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 150a5aa5..93e1552a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 982e09b9..e0292731 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-bullseye + VARIANT: 18-buster volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100755 new mode 100644 From d1108f468815b3da2c5638d0b62e012a5b727a7d Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Mon, 10 Jun 2024 11:00:33 -0500 Subject: [PATCH 14/20] Changed "Assigned" text to "Mine" --- voyager/src/routes/scouting/match/+page.svelte | 2 +- voyager/src/routes/scouting/pit/+page.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/voyager/src/routes/scouting/match/+page.svelte b/voyager/src/routes/scouting/match/+page.svelte index 8af311aa..6a59db60 100644 --- a/voyager/src/routes/scouting/match/+page.svelte +++ b/voyager/src/routes/scouting/match/+page.svelte @@ -13,7 +13,7 @@ setPageTitle(msg('scouting.match'), msg('scouting.scheduleVersion', {checksum: data.checksum})); const tabs = [ - { id: 'mine', icon: 'person', label: 'Assigned' }, + { id: 'mine', icon: 'person', label: 'Mine' }, { id: 'all', icon: 'groups', label: 'All' } ]; diff --git a/voyager/src/routes/scouting/pit/+page.svelte b/voyager/src/routes/scouting/pit/+page.svelte index fc87c9f9..991c5628 100644 --- a/voyager/src/routes/scouting/pit/+page.svelte +++ b/voyager/src/routes/scouting/pit/+page.svelte @@ -9,7 +9,7 @@ export let data: PageData; const tabs = [ - { id: 'mine', icon: 'person', label: 'Assigned' }, + { id: 'mine', icon: 'person', label: 'Mine' }, { id: 'partner', icon: 'group', label: "Partner's" }, { id: 'all', icon: 'groups', label: 'All' } ]; From 1fe7fdd5abd8212caf83672f1d1ab3e64d36a1d9 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Mon, 10 Jun 2024 11:08:01 -0500 Subject: [PATCH 15/20] change "Assigned" text to "Mine" --- voyager/src/routes/scouting/match/+page.svelte | 2 +- voyager/src/routes/scouting/pit/+page.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/voyager/src/routes/scouting/match/+page.svelte b/voyager/src/routes/scouting/match/+page.svelte index 8af311aa..6a59db60 100644 --- a/voyager/src/routes/scouting/match/+page.svelte +++ b/voyager/src/routes/scouting/match/+page.svelte @@ -13,7 +13,7 @@ setPageTitle(msg('scouting.match'), msg('scouting.scheduleVersion', {checksum: data.checksum})); const tabs = [ - { id: 'mine', icon: 'person', label: 'Assigned' }, + { id: 'mine', icon: 'person', label: 'Mine' }, { id: 'all', icon: 'groups', label: 'All' } ]; diff --git a/voyager/src/routes/scouting/pit/+page.svelte b/voyager/src/routes/scouting/pit/+page.svelte index fc87c9f9..991c5628 100644 --- a/voyager/src/routes/scouting/pit/+page.svelte +++ b/voyager/src/routes/scouting/pit/+page.svelte @@ -9,7 +9,7 @@ export let data: PageData; const tabs = [ - { id: 'mine', icon: 'person', label: 'Assigned' }, + { id: 'mine', icon: 'person', label: 'Mine' }, { id: 'partner', icon: 'group', label: "Partner's" }, { id: 'all', icon: 'groups', label: 'All' } ]; From df8485ca6e6e10eb9497125b891d1e1badaad554 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Mon, 10 Jun 2024 11:10:08 -0500 Subject: [PATCH 16/20] Merge branch 'Issue-#221' of https://github.com/daonguyenk06/scoutradioz into Issue-#221 --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 .gitignore | 3 +++ 4 files changed, 11 insertions(+), 8 deletions(-) mode change 100644 => 100755 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 93e1552a..150a5aa5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e0292731..982e09b9 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-buster + VARIANT: 18-bullseye volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore index e7dcab73..02446945 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ yarn-error.log voyager/static/*.css* voyager/.sst scoutradioz-utilities/types/utilities.d.ts +.devcontainer/docker-compose.yml +.devcontainer/Dockerfile +.devcontainer/import-database.sh From dcef2957aa72735b65fd54fa1741be079c39098f Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Tue, 18 Jun 2024 13:57:01 -0500 Subject: [PATCH 17/20] Changes between 'buster' and 'bullseye' conditioned with OP system --- .devcontainer/Dockerfile | 6 ++++++ .devcontainer/docker-compose.yml | 4 +++- .devcontainer/setup.sh | 15 +++++++++++++++ .gitignore | 3 --- build-and-run.sh | 0 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 build-and-run.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 150a5aa5..a1e2f5f5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -12,6 +12,12 @@ RUN . /etc/os-release \ && apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get install -y mongodb-database-tools mongodb-mongosh \ && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + elif [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ fi # [Optional] Uncomment this section to install additional OS packages. diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 982e09b9..9648ccf5 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,9 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-bullseye + + # The VARIANT argument is set from an environment variable + VARIANT: ${NODE_VARIANT} volumes: - ..:/workspace:cached diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index 423cd767..bd9833d2 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -25,3 +25,18 @@ done # Install node modules yarn setup + +# Detect the operating system version and set the NODE_VARIANT accordingly +OS_VERSION=$(lsb_release -cs) + +if [ "$OS_VERSION" = "bullseye" ]; then + export NODE_VARIANT="18-bullseye" +elif [ "$OS_VERSION" = "buster" ]; then + export NODE_VARIANT="18-buster" +else + echo "Unsupported OS version: $OS_VERSION" + exit 1 +fi + +# Run docker-compose with the appropriate NODE_VARIANT +docker-compose up --build \ No newline at end of file diff --git a/.gitignore b/.gitignore index 02446945..e7dcab73 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,3 @@ yarn-error.log voyager/static/*.css* voyager/.sst scoutradioz-utilities/types/utilities.d.ts -.devcontainer/docker-compose.yml -.devcontainer/Dockerfile -.devcontainer/import-database.sh diff --git a/build-and-run.sh b/build-and-run.sh new file mode 100644 index 00000000..e69de29b From 028ad80abcf431e9c727cd8fc7aef742717cd980 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Tue, 18 Jun 2024 14:03:16 -0500 Subject: [PATCH 18/20] Changes between 'buster' and 'bullseye' conditioned with OP system --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 .gitignore | 3 --- 4 files changed, 8 insertions(+), 11 deletions(-) mode change 100755 => 100644 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 150a5aa5..93e1552a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 982e09b9..e0292731 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-bullseye + VARIANT: 18-buster volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100755 new mode 100644 diff --git a/.gitignore b/.gitignore index 02446945..e7dcab73 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,3 @@ yarn-error.log voyager/static/*.css* voyager/.sst scoutradioz-utilities/types/utilities.d.ts -.devcontainer/docker-compose.yml -.devcontainer/Dockerfile -.devcontainer/import-database.sh From feab879d14ec846fdf806ecb2bcfcfa27a475de9 Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Tue, 18 Jun 2024 14:14:07 -0500 Subject: [PATCH 19/20] setup --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 .gitignore | 3 --- 4 files changed, 8 insertions(+), 11 deletions(-) mode change 100755 => 100644 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 150a5aa5..93e1552a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 982e09b9..e0292731 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-bullseye + VARIANT: 18-buster volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100755 new mode 100644 diff --git a/.gitignore b/.gitignore index 02446945..e7dcab73 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,3 @@ yarn-error.log voyager/static/*.css* voyager/.sst scoutradioz-utilities/types/utilities.d.ts -.devcontainer/docker-compose.yml -.devcontainer/Dockerfile -.devcontainer/import-database.sh From cbe474620bdaf12b7a8910d9f431ccd0f7e7f07c Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Tue, 18 Jun 2024 14:52:27 -0500 Subject: [PATCH 20/20] Update docker-compose.yml --- .devcontainer/Dockerfile | 6 ++++++ .devcontainer/docker-compose.yml | 2 +- .devcontainer/setup.sh | 37 ++++++++++++++++++++++++++++++++ .gitignore | 3 --- build-and-run.sh | 0 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 build-and-run.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 150a5aa5..a1e2f5f5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -12,6 +12,12 @@ RUN . /etc/os-release \ && apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get install -y mongodb-database-tools mongodb-mongosh \ && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + elif [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ fi # [Optional] Uncomment this section to install additional OS packages. diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 982e09b9..e0292731 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14. # Append -bullseye or -buster to pin to an OS version. # Use -bullseye variants on local arm64/Apple Silicon. - VARIANT: 18-bullseye + VARIANT: 18-buster volumes: - ..:/workspace:cached diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index 423cd767..f5a9d90d 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -23,5 +23,42 @@ for dbsfile in "${dbsfiles[@]}"; do fi done +# Detect OS version +detect_os_version() { + if [ -f /etc/os-release ]; then + . /etc/os-release + OS_VERSION=$VERSION_CODENAME + else + echo "Unsupported OS: /etc/os-release not found" + exit 1 + fi +} + +# Set NODE_VARIANT based on OS version +set_node_variant() { + case $OS_VERSION in + "bullseye") + export VARIANT="18-bullseye" + ;; + "buster") + export VARIANT="18-buster" + ;; + *) + echo "Unsupported OS version: $OS_VERSION" + exit 1 + ;; + esac +} + # Install node modules yarn setup + +# Main script execution +detect_os_version +set_node_variant + +# Make setup.sh executable if not already +chmod +x setup.sh + +# Execute docker-compose with the appropriate VARIANT +docker-compose up --build \ No newline at end of file diff --git a/.gitignore b/.gitignore index 02446945..e7dcab73 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,3 @@ yarn-error.log voyager/static/*.css* voyager/.sst scoutradioz-utilities/types/utilities.d.ts -.devcontainer/docker-compose.yml -.devcontainer/Dockerfile -.devcontainer/import-database.sh diff --git a/build-and-run.sh b/build-and-run.sh new file mode 100644 index 00000000..e69de29b