From ff8bffbdb4dba723972db2c0b609be37ae78a666 Mon Sep 17 00:00:00 2001 From: Christopher Stevers <72156679+Christopher-Stevers@users.noreply.github.com> Date: Tue, 18 Apr 2023 18:36:22 +0000 Subject: [PATCH] completed space saving up dates to fullstack --- .gitignore | 1 + Dockerfile | 2 +- commitpush.sh | 3 +++ docker-compose.yml | 3 +-- ignore.sh | 36 ++++++++++++++++++++++++++++++++++++ package.json | 5 ++--- yarn-error.log | 40 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 commitpush.sh create mode 100644 ignore.sh create mode 100644 yarn-error.log diff --git a/.gitignore b/.gitignore index d47dbab..e407e90 100755 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ yarn.lock notes.txt test/ tmp/ +node_modules/ secret.yml github.txt diff --git a/Dockerfile b/Dockerfile index 79b0e7a..d0bb202 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM node:18-alpine WORKDIR /app -RUN apk add git +RUN apk add git bash COPY . . RUN echo "Installing dependencies" diff --git a/commitpush.sh b/commitpush.sh new file mode 100644 index 0000000..df80d01 --- /dev/null +++ b/commitpush.sh @@ -0,0 +1,3 @@ +git add . +git commit -m"updated to share node modules via docker" +git push origin "$(git branch --show-current)":docker-shared-modules \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 4727fd1..51afd52 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -251,7 +251,6 @@ services: - modules_vol:/app/node_modules - /app/.next - ./OpenQ-Frontend:/app - - ./OpenQ-Contracts/artifacts:/app/artifacts github-oauth-server: container_name: github-oauth-server depends_on: @@ -288,7 +287,7 @@ services: ports: - "3007:3007" volumes: - - modules_vol:/app/node_modules + - /app/node_modules - /app/tmp - ./OpenQ-Email-Server:/app env_file: diff --git a/ignore.sh b/ignore.sh new file mode 100644 index 0000000..cd5f5b1 --- /dev/null +++ b/ignore.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +declare -a repos=( + "OpenQ-CoinAPI" + "OpenQ-Oracle" + "OpenQ-Frontend" + "OpenQ-Contracts" + "OpenQ-Github-OAuth-Server" + "OpenQ-Graph" + "OpenQ-Kubeconfig" + "OpenQ-Bot" + "OpenQ-API" + "OpenQ-Architecture" + "OpenQ-OZ-Claim-Autotask" + "OpenQ-Bounty-Actions-Autotask" + "OpenQ-Event-Listener" + "OpenQ-Token-Price-Cron-Job" + "Superfluid-Subgraph" + "OpenQ-Synpress" + "OpenQ-Notification-Autotask" + "OpenQ-User-Registration" + "OpenQ-Email-Server" + "OpenQ-Helm" + "OpenQ-Github-Proxy" + "OpenQ-Document-Manager" + ) + +echo 'CAREFUL THIS SCRIPT STASHES ALL REPOS' + +for repo in "${repos[@]}" +do + cd "$repo" + git config core.fileMode false + echo "Ignored $repo" + cd .. +done diff --git a/package.json b/package.json index 34cad32..232b5e3 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "OpenQ-CoinAPI", "OpenQ-Oracle", "OpenQ-Frontend", - "OpenQ-Contracts", "OpenQ-Github-OAuth-Server", "OpenQ-Helm", "OpenQ-JSON-RPC-Node", @@ -25,9 +24,9 @@ "OpenQ-Token-Price-Cron-Job", "Superfluid-Subgraph", "OpenQ-User-Registration", - "OpenQ-Email-Server", "OpenQ-Document-Manager", "OpenQ-Notification-Autotask", - "OpenQ-Synpress" + "OpenQ-Synpress", + "OpenQ-Contracts" ] } \ No newline at end of file diff --git a/yarn-error.log b/yarn-error.log new file mode 100644 index 0000000..44d6269 --- /dev/null +++ b/yarn-error.log @@ -0,0 +1,40 @@ +Arguments: + /usr/local/share/nvm/versions/node/v18.15.0/bin/node /usr/share/yarn/bin/yarn.js + +PATH: + /usr/local/rvm/gems/ruby-3.1.4/bin:/usr/local/rvm/gems/ruby-3.1.4@global/bin:/usr/local/rvm/rubies/ruby-3.1.4/bin:/vscode/bin/linux-x64/704ed70d4fd1c6bd6342c436f1ede30d1cff4710/bin/remote-cli:/home/codespace/.local/bin:/home/codespace/.dotnet:/home/codespace/nvm/current/bin:/home/codespace/.php/current/bin:/home/codespace/.python/current/bin:/home/codespace/java/current/bin:/home/codespace/.ruby/current/bin:/home/codespace/.local/bin:/usr/local/oryx:/usr/local/go/bin:/go/bin:/usr/local/sdkman/bin:/usr/local/sdkman/candidates/java/current/bin:/usr/local/sdkman/candidates/gradle/current/bin:/usr/local/sdkman/candidates/maven/current/bin:/usr/local/sdkman/candidates/ant/current/bin:/usr/local/rvm/gems/default/bin:/usr/local/rvm/gems/default@global/bin:/usr/local/rvm/rubies/default/bin:/usr/local/share/rbenv/bin:/opt/conda/bin:/usr/local/php/current/bin:/usr/local/python/current/bin:/usr/local/py-utils/bin:/usr/local/nvs:/usr/local/share/nvm/versions/node/v18.15.0/bin:/usr/local/hugo/bin:/usr/local/dotnet/current:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/codespace/.dotnet/tools:/usr/local/rvm/bin + +Yarn version: + 1.22.19 + +Node version: + 18.15.0 + +Platform: + linux x64 + +Trace: + SyntaxError: /workspaces/OpenQ-Fullstack/package.json: Unexpected token ] in JSON at position 139 + at JSON.parse () + at /usr/share/yarn/lib/cli.js:1629:59 + at Generator.next () + at step (/usr/share/yarn/lib/cli.js:310:30) + at /usr/share/yarn/lib/cli.js:321:13 + +npm manifest: + { + "name": "module-manager", + "private": true, + "scripts": { + "start": "nodemon index.js" + }, + "workspaces": [ + "OpenQ-Event-Listener", + ] + } + +yarn manifest: + No manifest + +Lockfile: + No lockfile