From d8e346ddb458d6698102684f70db859395b0a635 Mon Sep 17 00:00:00 2001 From: texm Date: Thu, 27 Apr 2023 21:33:08 +0800 Subject: [PATCH] web copy, dev, ci --- .github/workflows/publish-web.yml | 12 ++++------- Justfile | 6 +++--- web/src/routes/Features.svelte | 11 +++++----- web/src/routes/Hero.svelte | 4 ++-- web/src/routes/docs/+layout.svelte | 2 +- web/src/routes/docs/installation/+page.svelte | 2 +- web/src/routes/docs/intro/+page.svelte | 21 +++++++++---------- web/src/routes/docs/setup/+page.svelte | 10 +++++---- 8 files changed, 32 insertions(+), 36 deletions(-) diff --git a/.github/workflows/publish-web.yml b/.github/workflows/publish-web.yml index d151713..e2a41ee 100644 --- a/.github/workflows/publish-web.yml +++ b/.github/workflows/publish-web.yml @@ -19,15 +19,10 @@ concurrency: jobs: build: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./web steps: - name: Checkout uses: actions/checkout@v3 - # - uses: actions/configure-pages@v1 - # id: pages - name: Install Node.js uses: actions/setup-node@v3 @@ -43,9 +38,10 @@ jobs: env: BASE_PATH: '' run: | - npm run build - touch build/.nojekyll - echo "shokku.dev" > build/CNAME + npm --prefix web run build + touch web/build/.nojekyll + cp bootstrap.sh web/build + echo "shokku.dev" > web/build/CNAME - name: Upload artifact uses: actions/upload-pages-artifact@v1 with: diff --git a/Justfile b/Justfile index 6db7800..3d925ec 100644 --- a/Justfile +++ b/Justfile @@ -5,7 +5,8 @@ web_npm := 'npm --prefix web' shokku_image := 'texm/shokku:latest' dokku_image := 'dokku/dokku:0.30.2' dokku_container_name := 'shokku-dokku-dev' -dokku_data_mount_dir := '/tmp/var/lib/dokku' +# for linux can this just be /var/lib/dokku ? +dokku_data_mount_dir := '/tmp/colima/var/lib/dokku' dokku_ssh_host := '127.0.0.1' dokku_ssh_port := '3022' db_path := 'test.db' @@ -143,8 +144,7 @@ _setup-dokku: for plugin in redis postgres mongo mysql letsencrypt; do \ echo "installing $plugin"; \ docker exec {{dokku_container_name}} bash -c \ - "dokku plugin:install https://github.com/dokku/dokku-$plugin.git" \ - > /dev/null; \ + "dokku plugin:install https://github.com/dokku/dokku-$plugin.git" > /dev/null; \ done # to fix plugins: https://github.com/dokku/dokku/issues/5004 diff --git a/web/src/routes/Features.svelte b/web/src/routes/Features.svelte index 5edee7a..56314eb 100644 --- a/web/src/routes/Features.svelte +++ b/web/src/routes/Features.svelte @@ -1,18 +1,17 @@
{#each features as feature} -
+

{feature.title}

- +

{feature.description}

diff --git a/web/src/routes/Hero.svelte b/web/src/routes/Hero.svelte index c56913f..b63b1de 100644 --- a/web/src/routes/Hero.svelte +++ b/web/src/routes/Hero.svelte @@ -8,9 +8,9 @@
-

A friendly interface for Dokku

+

A friendly interface for Dokku

- an open-source self-hostable web UI to help + an open-source web UI to help configure and deploy your apps and services with Dokku

diff --git a/web/src/routes/docs/+layout.svelte b/web/src/routes/docs/+layout.svelte index b60b603..10017a6 100644 --- a/web/src/routes/docs/+layout.svelte +++ b/web/src/routes/docs/+layout.svelte @@ -10,7 +10,7 @@ {ref: "/docs/setup", label: "Setup"}, {section: "Usage", ref: "/docs/apps", label: "Apps"}, {ref: "/docs/services", label: "Services"}, - {ref: "/docs/settings", label: "Settings"}, + // {ref: "/docs/settings", label: "Settings"}, {section: "Maintenance", ref: "/docs/upgrading", label: "Upgrading"}, {ref: "/docs/uninstall", label: "Uninstall"}, {ref: "/docs/support", label: "Support"}, diff --git a/web/src/routes/docs/installation/+page.svelte b/web/src/routes/docs/installation/+page.svelte index ab2b5d8..7b28208 100644 --- a/web/src/routes/docs/installation/+page.svelte +++ b/web/src/routes/docs/installation/+page.svelte @@ -47,7 +47,7 @@

DigitalOcean

For a cheap hosted server to try Shokku out, consider using DigitalOcean via this referral - link. You get $200 in credit for 60 days, and I get a $25 kick back :) + link. I get a kickback, and you get $200 in credit for 60 days - why not provision something beefy :)

DigitalOcean Referral Badge diff --git a/web/src/routes/docs/intro/+page.svelte b/web/src/routes/docs/intro/+page.svelte index 36b8f12..9b80f49 100644 --- a/web/src/routes/docs/intro/+page.svelte +++ b/web/src/routes/docs/intro/+page.svelte @@ -1,17 +1,16 @@

- Shokku is an interface for Dokku - a - self-hostable PaaS/alternative to Heroku. + Shokku is an interface for Dokku - an + open source, self-hostable PaaS + (commercial options include Heroku, fly.io, + or Render)
- It is recommended you are somewhat familiar with the underlying Dokku project + It is recommended you are familiar with the underlying Dokku project (read the docs).

- It is not associated with Dokku. -

- -

- It is open-source and freely available, the repository is hosted on Github at + Shokku is not associated with Dokku - but it is similarly open-source and + freely available on Github at texm/shokku.

@@ -24,15 +23,15 @@

    -
  • Works with your existing Dokku installation, or configures one during setup
    • +
  • Deploys as an app via an existing Dokku installation
  • Build, deploy, and manage almost any kind of application easily
  • Easy creation of Redis, PostgreSQL, MySQL, and MongoDB services
    • -
  • Reverse proxy and automatic SSL via LetsEncrypt
  • Github Integration
    • Single-user or organisation installation
    • User management / Authentication
      • -
    • Repo-aware smart suggestions
      • +
    • todo: Repo-aware smart suggestions
  • Optional API Access
    • +
  • ... and more, try it out!
\ No newline at end of file diff --git a/web/src/routes/docs/setup/+page.svelte b/web/src/routes/docs/setup/+page.svelte index e9e34b9..76df677 100644 --- a/web/src/routes/docs/setup/+page.svelte +++ b/web/src/routes/docs/setup/+page.svelte @@ -1,17 +1,19 @@ -

Get Setup Key

+

Setup Key

Once installation is finished, a setup key will be output to the console. Copy this, you will need it for the initial web setup. +
+ This setup key is used to prevent any random internet stranger setting + up your deployment before you do.

-

Choose Setup Method

+

Choose a Setup Method

Github

Setting up with Github creates a Github App to