From 82cf86ef571e44fe0d76d0709d4e5f8eeb02a6c0 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 12 Aug 2023 03:15:22 -0600 Subject: [PATCH 01/31] Update docker --- config/settings.example.yml | 2 +- docker/Dockerfile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/settings.example.yml b/config/settings.example.yml index dac14502..647dd1be 100644 --- a/config/settings.example.yml +++ b/config/settings.example.yml @@ -3,4 +3,4 @@ verboseLogging: "false" private: "false" username: "ruby" password: "ruby" -mainURL: "" +mainURL: "http://localhost:9293/" diff --git a/docker/Dockerfile b/docker/Dockerfile index c98cf54e..043739a9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,11 +7,13 @@ RUN apt update && apt install -y ruby-full # Installing Bundler RUN gem install bundler # Install Node.js dependencies -RUN npm install +RUN npm install # Install Ruby dependencies RUN bundle install +# Build the Dynamic +RUN npm run build # Setup a basic configuration RUN cp config/settings.example.yml config/settings.yml # Run the app EXPOSE 9293 -CMD yarn start +CMD npm start From 4390faf0c43052f8d88acff6f397c0183966f92c Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 12 Aug 2023 03:16:51 -0600 Subject: [PATCH 02/31] English Linear Completed: RUBY-30 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 043739a9..6c78c388 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,7 +10,7 @@ RUN gem install bundler RUN npm install # Install Ruby dependencies RUN bundle install -# Build the Dynamic +# Build Dynamic RUN npm run build # Setup a basic configuration RUN cp config/settings.example.yml config/settings.yml From 8475a34ff5afc4fc83f26ad05a831273351ba5a0 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 12 Aug 2023 03:29:53 -0600 Subject: [PATCH 03/31] Testing --- docker/Dockerfile | 6 ++---- docker/docker-compose.yml | 3 +++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6c78c388..9071dce5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,12 +8,10 @@ RUN apt update && apt install -y ruby-full RUN gem install bundler # Install Node.js dependencies RUN npm install -# Install Ruby dependencies -RUN bundle install -# Build Dynamic -RUN npm run build # Setup a basic configuration RUN cp config/settings.example.yml config/settings.yml +# Mount the config file so the user can edit it +VOLUME /usr/src/app/config # Run the app EXPOSE 9293 CMD npm start diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 253134d5..b0018049 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,6 +6,9 @@ services: ports: #DO NOT CHANGE 9293! - your port here:9293 +volumes: + - ./config:/usr/src/app/config + #networks: # default: # external: From 1169eb1a3226ecbf96707f3416ba64f2b9851455 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 00:53:52 -0600 Subject: [PATCH 04/31] Docker now allows the ability to use the config --- docker/Dockerfile | 4 ++-- docker/docker-compose.build.yml | 4 +++- docker/docker-compose.yml | 23 +++++++++++------------ node-server/server.js | 2 +- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9071dce5..ecb2e6da 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,8 +10,8 @@ RUN gem install bundler RUN npm install # Setup a basic configuration RUN cp config/settings.example.yml config/settings.yml -# Mount the config file so the user can edit it -VOLUME /usr/src/app/config +# Mount config/settings.yml as a volume +VOLUME /usr/src/app/config/settings.yml # Run the app EXPOSE 9293 CMD npm start diff --git a/docker/docker-compose.build.yml b/docker/docker-compose.build.yml index 027f1b13..0d596d6a 100644 --- a/docker/docker-compose.build.yml +++ b/docker/docker-compose.build.yml @@ -7,7 +7,9 @@ services: restart: unless-stopped ports: # DO NOT CHANGE 9293! - - your port here:9293 + - 9293:9293 + volumes: + - ./config.yml:/usr/src/app/config/settings.yml #networks: # default: # external: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b0018049..a7c2a48d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,15 +1,14 @@ version: '2' services: - ruby: - restart: unless-stopped - image: 'ghcr.io/ruby-network/ruby:main' - ports: - #DO NOT CHANGE 9293! - - your port here:9293 -volumes: - - ./config:/usr/src/app/config - + ruby: + restart: unless-stopped + image: 'ghcr.io/ruby-network/ruby:main' + ports: + #DO NOT CHANGE 9293! + - 9293:9293 + volumes: + - ./config.yml:/usr/src/app/config/settings.yml #networks: -# default: -# external: -# name: default_net + # default: + # external: + # name: default_net diff --git a/node-server/server.js b/node-server/server.js index 2d452779..b71007e9 100644 --- a/node-server/server.js +++ b/node-server/server.js @@ -60,5 +60,5 @@ app.get('/search=:query', async (req, res) => { } }); -app.listen({ port: nodePort }); +app.listen({ port: nodePort, host: '0.0.0.0' }); console.log(chalk.green(`Server listening on port ${chalk.red(nodePort)}`)); From 55f8042ecef83dd4d3804b726ecd92bfba8d8d01 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 00:54:58 -0600 Subject: [PATCH 05/31] no --- docker/docker-compose.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.build.yml b/docker/docker-compose.build.yml index 0d596d6a..0451ae21 100644 --- a/docker/docker-compose.build.yml +++ b/docker/docker-compose.build.yml @@ -7,7 +7,7 @@ services: restart: unless-stopped ports: # DO NOT CHANGE 9293! - - 9293:9293 + - your port here:9293 volumes: - ./config.yml:/usr/src/app/config/settings.yml #networks: From e3481a5639ebcaf1e4c88c4b23c3a949c6a7e7c6 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:17:37 -0600 Subject: [PATCH 06/31] idk --- docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ecb2e6da..5b4e929c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,11 +7,12 @@ RUN apt update && apt install -y ruby-full # Installing Bundler RUN gem install bundler # Install Node.js dependencies -RUN npm install +RUN npm install -g yarn +RUN yarn install # Setup a basic configuration RUN cp config/settings.example.yml config/settings.yml # Mount config/settings.yml as a volume VOLUME /usr/src/app/config/settings.yml # Run the app EXPOSE 9293 -CMD npm start +CMD yarn start From 391f68dc678149c2222adcbeca96497feb2e1b4e Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:19:15 -0600 Subject: [PATCH 07/31] add render --- render.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 render.yaml diff --git a/render.yaml b/render.yaml new file mode 100644 index 00000000..2741ed65 --- /dev/null +++ b/render.yaml @@ -0,0 +1,7 @@ +services: + - type: web + name: ruby + env: node + plan: free + buildCommand: yarn + startCommand: yarn start From c209415622a9ba84be6678cd845795f356f0e561 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:21:42 -0600 Subject: [PATCH 08/31] force 18 or above --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index e3e86dd5..a99acbf3 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,9 @@ "start": "bundle exec puma -e production", "install": "bundle install && npm run build", "build": "node ./build.js" + }, + "engines": { + "node": ">=18.0.0 <20.0.0" }, "dependencies": { "@fastify/http-proxy": "^9.2.1", From e9cba075d12aec1d2a05cc4eee71168a9b448905 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:23:20 -0600 Subject: [PATCH 09/31] lets see --- render.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/render.yaml b/render.yaml index 2741ed65..891d13a7 100644 --- a/render.yaml +++ b/render.yaml @@ -1,7 +1,7 @@ services: - type: web name: ruby - env: node + env: node, ruby plan: free - buildCommand: yarn + buildCommand: gem install bundler && yarn startCommand: yarn start From decd354e36abed2ca5d3ecb9ed4d035ca56590c4 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:30:33 -0600 Subject: [PATCH 10/31] test --- render.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/render.yaml b/render.yaml index 891d13a7..f8211771 100644 --- a/render.yaml +++ b/render.yaml @@ -1,7 +1,6 @@ services: - type: web name: ruby - env: node, ruby plan: free buildCommand: gem install bundler && yarn startCommand: yarn start From 401afa253c11bdbc7b5dee40a864c7c8d5cbea35 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:31:11 -0600 Subject: [PATCH 11/31] ? --- render.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/render.yaml b/render.yaml index f8211771..8ede6147 100644 --- a/render.yaml +++ b/render.yaml @@ -2,5 +2,6 @@ services: - type: web name: ruby plan: free + env: ruby buildCommand: gem install bundler && yarn startCommand: yarn start From f37c85710baf8ecd1b5669bb144722e264a9867a Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:33:53 -0600 Subject: [PATCH 12/31] specify --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 263ff77c..4468198a 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,7 @@ source "https://rubygems.org" +ruby ">= 3.0.0" gem "sinatra" gem "sinatra-contrib" gem "puma" From 08e2c4c9de3e6a8eac21d0c3371b7fa3251e751a Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:36:33 -0600 Subject: [PATCH 13/31] this should work now --- .gitignore | 1 - Gemfile.lock | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ render.yaml | 2 +- 3 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index af1b9b2c..35697e37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ node_modules/ package-lock.json yarn.lock -Gemfile.lock .env settings.yml .bundle/ diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..ec20b349 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,105 @@ +GEM + remote: https://rubygems.org/ + specs: + colorize (1.1.0) + concurrent-ruby (1.2.2) + config (4.2.1) + deep_merge (~> 1.2, >= 1.2.1) + dry-validation (~> 1.0, >= 1.0.0) + deep_merge (1.2.2) + dry-configurable (1.1.0) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-core (1.0.1) + concurrent-ruby (~> 1.0) + zeitwerk (~> 2.6) + dry-inflector (1.0.0) + dry-initializer (3.1.1) + dry-logic (1.5.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) + dry-schema (1.13.2) + concurrent-ruby (~> 1.0) + dry-configurable (~> 1.0, >= 1.0.1) + dry-core (~> 1.0, < 2) + dry-initializer (~> 3.0) + dry-logic (>= 1.4, < 2) + dry-types (>= 1.7, < 2) + zeitwerk (~> 2.6) + dry-types (1.7.1) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + dry-validation (1.10.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0, < 2) + dry-initializer (~> 3.0) + dry-schema (>= 1.12, < 2) + zeitwerk (~> 2.6) + encrypted_cookie (0.1.0) + rack (>= 1.1, < 3) + ffi (1.15.5) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + multi_json (1.15.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + nio4r (2.5.9) + os (1.1.4) + puma (6.3.0) + nio4r (~> 2.0) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + rack-proxy (0.7.6) + rack + rack-reverse-proxy (0.12.0) + rack (>= 1.0.0) + rack-proxy (~> 0.6, >= 0.6.1) + rack_csrf (2.7.0) + rack (>= 1.1.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rerun (0.14.0) + listen (~> 3.0) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + sinatra-contrib (3.1.0) + multi_json + mustermann (~> 3.0) + rack-protection (= 3.1.0) + sinatra (= 3.1.0) + tilt (~> 2.0) + tilt (2.2.0) + yaml (0.2.1) + zeitwerk (2.6.11) + +PLATFORMS + x86_64-linux + +DEPENDENCIES + colorize + config + dry-schema + dry-validation + encrypted_cookie + os + puma + rack-reverse-proxy + rack_csrf + rerun + sinatra + sinatra-contrib + yaml + +BUNDLED WITH + 2.4.13 diff --git a/render.yaml b/render.yaml index 8ede6147..e7340ee7 100644 --- a/render.yaml +++ b/render.yaml @@ -3,5 +3,5 @@ services: name: ruby plan: free env: ruby - buildCommand: gem install bundler && yarn + buildCommand: yarn startCommand: yarn start From 88f5e47c9625aa0fe428276d23b2cc27ac701d29 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:40:01 -0600 Subject: [PATCH 14/31] forgot about settings.yml --- render.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render.yaml b/render.yaml index e7340ee7..b71f14ab 100644 --- a/render.yaml +++ b/render.yaml @@ -3,5 +3,5 @@ services: name: ruby plan: free env: ruby - buildCommand: yarn + buildCommand: yarn && cp config/settings.yml.example config/settings.yml startCommand: yarn start From 8d0cf633635a79d322fae389d4ede13d14e811dc Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 01:43:19 -0600 Subject: [PATCH 15/31] aughgh --- render.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render.yaml b/render.yaml index b71f14ab..fc5b90ad 100644 --- a/render.yaml +++ b/render.yaml @@ -3,5 +3,5 @@ services: name: ruby plan: free env: ruby - buildCommand: yarn && cp config/settings.yml.example config/settings.yml + buildCommand: yarn && cp config/settings.example.yml config/settings.yml startCommand: yarn start From ab758accf05ef1d862f92c60c561eb09efb88232 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:02:17 -0600 Subject: [PATCH 16/31] lets try that --- package.json | 2 +- render.yaml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a99acbf3..3e92123e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "build": "node ./build.js" }, "engines": { - "node": ">=18.0.0 <20.0.0" + "node": ">=18.0.0" }, "dependencies": { "@fastify/http-proxy": "^9.2.1", diff --git a/render.yaml b/render.yaml index fc5b90ad..c4782ee7 100644 --- a/render.yaml +++ b/render.yaml @@ -2,6 +2,5 @@ services: - type: web name: ruby plan: free - env: ruby - buildCommand: yarn && cp config/settings.example.yml config/settings.yml - startCommand: yarn start + env: docker + image: ghcr.io/ruby-network/ruby:main From d052e46787a6322809773187a0a64cf48ff0b00e Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:10:23 -0600 Subject: [PATCH 17/31] remove npm run build from install --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e92123e..d82aefdc 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "scripts": { "dev": "bundle exec rerun --ignore 'src/public/css/*' --signal 'TERM' -c -w 5 --no-notify -- puma", "start": "bundle exec puma -e production", - "install": "bundle install && npm run build", + "install": "bundle install", "build": "node ./build.js" }, "engines": { From 32a895cc41a00ba832aa330452d12bd632f10115 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:11:23 -0600 Subject: [PATCH 18/31] update dockerfile --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5b4e929c..51f986e2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,6 +9,7 @@ RUN gem install bundler # Install Node.js dependencies RUN npm install -g yarn RUN yarn install +RUN yarn build # Setup a basic configuration RUN cp config/settings.example.yml config/settings.yml # Mount config/settings.yml as a volume From bda12c494a4c3e760a21c8bf9d03d80b247e7ab2 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:13:29 -0600 Subject: [PATCH 19/31] you have got to be kidding me --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 51f986e2..f2afca45 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ RUN apt update && apt install -y ruby-full # Installing Bundler RUN gem install bundler # Install Node.js dependencies -RUN npm install -g yarn +RUN npm install -g yarn --force RUN yarn install RUN yarn build # Setup a basic configuration From a6b244d00a6f94ff47427c01813ba85d34486eb2 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:16:53 -0600 Subject: [PATCH 20/31] stupid CI --- .github/workflows/docker-build.yml | 2 ++ docker/Dockerfile | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index a3d60515..dc1215a5 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -15,6 +15,8 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v3 + with: + submodules: true - name: Setup Docker Buildx uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - name: Login To registry ${{ env.REGISTRY }} diff --git a/docker/Dockerfile b/docker/Dockerfile index f2afca45..51f986e2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ RUN apt update && apt install -y ruby-full # Installing Bundler RUN gem install bundler # Install Node.js dependencies -RUN npm install -g yarn --force +RUN npm install -g yarn RUN yarn install RUN yarn build # Setup a basic configuration diff --git a/package.json b/package.json index d82aefdc..3e92123e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "scripts": { "dev": "bundle exec rerun --ignore 'src/public/css/*' --signal 'TERM' -c -w 5 --no-notify -- puma", "start": "bundle exec puma -e production", - "install": "bundle install", + "install": "bundle install && npm run build", "build": "node ./build.js" }, "engines": { From 9b4329ff79152a746a028868b05abdad881efc8e Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:19:58 -0600 Subject: [PATCH 21/31] CI --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index dc1215a5..7e287c09 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout Repo uses: actions/checkout@v3 with: - submodules: true + submodules: 'recursive' - name: Setup Docker Buildx uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - name: Login To registry ${{ env.REGISTRY }} From 483f3b8e955b507ac46a8548566e93df16587b45 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:22:21 -0600 Subject: [PATCH 22/31] SUBMODULES! --- .github/workflows/docker-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 7e287c09..930dd54f 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -15,8 +15,8 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v3 - with: - submodules: 'recursive' + - name: Submodule Update + run: git submodule update --init --recursive - name: Setup Docker Buildx uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf - name: Login To registry ${{ env.REGISTRY }} From d6891a7f33e4917d9b6ed7f21ad50d5920e1769a Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:24:25 -0600 Subject: [PATCH 23/31] AUGHGH --- docker/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 51f986e2..1c3fc147 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,8 +6,6 @@ COPY . . RUN apt update && apt install -y ruby-full # Installing Bundler RUN gem install bundler -# Install Node.js dependencies -RUN npm install -g yarn RUN yarn install RUN yarn build # Setup a basic configuration From e9af427421b2f2ef2928cd7b9802bbb2fed272eb Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:37:04 -0600 Subject: [PATCH 24/31] e --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 930dd54f..cdc4e1d2 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -24,7 +24,7 @@ jobs: with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.GH_TOKEN }} - name: Extract Docker metadata id: meta uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 From 03cac8445b1416d56b49a955fb0f3aa09942ec9f Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:45:14 -0600 Subject: [PATCH 25/31] try this render --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a7c2a48d..82ede779 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: ruby: restart: unless-stopped - image: 'ghcr.io/ruby-network/ruby:main' + image: 'ghcr.io/ruby-network/ruby' ports: #DO NOT CHANGE 9293! - 9293:9293 From 1305af6d785c2d9616114b10bbfd7251550556c0 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:46:22 -0600 Subject: [PATCH 26/31] try this render --- render.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/render.yaml b/render.yaml index c4782ee7..36cb5e50 100644 --- a/render.yaml +++ b/render.yaml @@ -3,4 +3,4 @@ services: name: ruby plan: free env: docker - image: ghcr.io/ruby-network/ruby:main + image: https://ghcr.io/ruby-network/ruby:main From 68b8cb6b081a0379e6084b5f14948b669ff29e64 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:53:53 -0600 Subject: [PATCH 27/31] Render can come later --- docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1c3fc147..263b0f4e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,6 @@ RUN apt update && apt install -y ruby-full # Installing Bundler RUN gem install bundler RUN yarn install -RUN yarn build # Setup a basic configuration RUN cp config/settings.example.yml config/settings.yml # Mount config/settings.yml as a volume From 587034f607607f5c7b004c7cdfe1ba18fac31846 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 02:56:25 -0600 Subject: [PATCH 28/31] Gitpod? --- .gitpod.yml | 3 +++ README.md | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 00000000..6ee7d7e8 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,3 @@ +tasks: + - init: yarn install + command: yarn start diff --git a/README.md b/README.md index 5056cc74..bc4f9c1f 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,6 @@ src="https://raw.githubusercontent.com/BinBashBanana/deploy-buttons/main/buttons/remade/render.svg" /> - - - - From 1983189b035a2bd622b3fae0870866996f9f7a8d Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 03:02:31 -0600 Subject: [PATCH 29/31] Too limiting --- .gitpod.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 6ee7d7e8..00000000 --- a/.gitpod.yml +++ /dev/null @@ -1,3 +0,0 @@ -tasks: - - init: yarn install - command: yarn start From 609cd612e892a65339daf16aa24b2e8afd8a298b Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 03:09:09 -0600 Subject: [PATCH 30/31] Replit --- .replit | 13 +++++++++++++ replit.nix | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 .replit create mode 100644 replit.nix diff --git a/.replit b/.replit new file mode 100644 index 00000000..d3bc39f5 --- /dev/null +++ b/.replit @@ -0,0 +1,13 @@ +language = "nix" +run = ["yarn", "start"] + +[packager] +language = "nodejs-npm" + +[nix] +channel = "stable-22_05" + +[debugger] + +[unitTest] +language = "nodejs" diff --git a/replit.nix b/replit.nix new file mode 100644 index 00000000..0c319cdd --- /dev/null +++ b/replit.nix @@ -0,0 +1,8 @@ +{ pkgs }: { + deps = [ + pkgs.nodejs-19_x + pkgs.yarn + pkgs.git + pkgs.ruby + ]; +} From 0b6635c99a0b8195482c15bd6162986d1ab0a578 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Mon, 14 Aug 2023 03:11:08 -0600 Subject: [PATCH 31/31] Replit doesn't work :skull: --- .replit | 13 ------------- replit.nix | 8 -------- 2 files changed, 21 deletions(-) delete mode 100644 .replit delete mode 100644 replit.nix diff --git a/.replit b/.replit deleted file mode 100644 index d3bc39f5..00000000 --- a/.replit +++ /dev/null @@ -1,13 +0,0 @@ -language = "nix" -run = ["yarn", "start"] - -[packager] -language = "nodejs-npm" - -[nix] -channel = "stable-22_05" - -[debugger] - -[unitTest] -language = "nodejs" diff --git a/replit.nix b/replit.nix deleted file mode 100644 index 0c319cdd..00000000 --- a/replit.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs }: { - deps = [ - pkgs.nodejs-19_x - pkgs.yarn - pkgs.git - pkgs.ruby - ]; -}