feat: update ckan-devstaller to v0.3.1

Author: rzmk

.github/workflows/run-ckan-only-install.yml

@@ -0,0 +1,23 @@
+name: Verify ckan-devstaller runs CKAN-only install successfully
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+jobs:
+  ckanonlyinstall:
+    name: Run ckan-devstaller with a CKAN-only install
+    runs-on: ubuntu-22.04
+    permissions:
+      # For the git-auto-commit-action
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Rust stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Cache cargo deps and target folder
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: ". -> target"
+      - name: Run ckan-devstaller
+        run: cargo run --release --verbose -- --ckan-version 2.11.4 --skip-interactive --skip-run

README.md

@@ -3,7 +3,7 @@
 <a href="https://ckan-devstaller.dathere.com"><img width="1165" height="668" alt="{1329F0BA-A29F-4BF8-BB6B-E3BA84FDAFCC}" src="https://github.com/user-attachments/assets/8f0cc4ef-d90d-4715-ba21-9083dff0c3ff" /></a>
 
 
-`ckan-devstaller` attempts to install a [CKAN](https://ckan.org) instance using [ckan-compose](https://github.com/tino097/ckan-compose) for development usage in a new Ubuntu 22.04 instance.
+`ckan-devstaller` attempts to install a [CKAN](https://ckan.org) instance using [ckan-compose](https://github.com/tino097/ckan-compose/tree/ckan-devstaller) for development usage in a new Ubuntu 22.04 instance.
 
 You may find `ckan-devstaller` useful for:
 

docs/app/(home)/page.tsx

@@ -118,7 +118,7 @@ function Hero() {
       </p>
       <div className="inline-flex items-center gap-3 max-md:mx-auto mb-8">
         <Link
-          href="/docs"
+          href="/docs/builder"
           className={cn(
             buttonVariants({ size: "lg", className: "rounded-full" }),
           )}
@@ -139,7 +139,7 @@ function Hero() {
         </Link>
       </div>
       <Cards>
-        <Card icon={<ZapIcon />} href="/docs" title="Quick start">
+        <Card icon={<ZapIcon />} href="/docs/builder" title="Quick start">
           Get started with ckan-devstaller and install CKAN within minutes
         </Card>
         <Card icon={<BlocksIcon />} href="/docs/builder" title="Builder">
@@ -312,15 +312,9 @@ function WhyInteractive(props: {
               download speed.
             </p>
             <div className="flex gap-2">
-              <Link href="/docs" className={cn(buttonVariants(), "not-prose")}>
+              <Link href="/docs/builder" className={cn(buttonVariants(), "not-prose")}>
                 Get started
               </Link>
-              <Link
-                href="/docs/builder"
-                className={cn(buttonVariants(), "not-prose")}
-              >
-                Customize your installation
-              </Link>
             </div>
           </WhyPanel>
         ) : null}

docs/app/global.css

@@ -2,4 +2,4 @@
 @import "fumadocs-ui/css/neutral.css";
 @import "fumadocs-ui/css/ocean.css";
 @import "fumadocs-ui/css/preset.css";
-@import "tw-animate-css";
+@import "tw-animate-css";

docs/bun.lock

@@ -11,26 +11,26 @@ export default function CKANVersionBuilderSection({ config, setConfig }: any) {
       <Cards>
         <Card
           icon={<SailboatIcon />}
-          title="2.11.3"
+          title="2.11.4"
           className={
-            config.ckanVersion === "2.11.3"
+            config.ckanVersion === "2.11.4"
               ? selectedCardClasses
               : "cursor-pointer"
           }
           onClick={() => {
-            setConfig({ ...config, ckanVersion: "2.11.3" });
+            setConfig({ ...config, ckanVersion: "2.11.4" });
           }}
         ></Card>
         <Card
           icon={<SailboatIcon />}
-          title="2.10.8"
+          title="2.10.9"
           className={
-            config.ckanVersion === "2.10.8"
+            config.ckanVersion === "2.10.9"
               ? selectedCardClasses
               : "cursor-pointer"
           }
           onClick={() => {
-            setConfig({ ...config, ckanVersion: "2.10.8" });
+            setConfig({ ...config, ckanVersion: "2.10.9" });
           }}
         ></Card>
       </Cards>

docs/components/builder-sections/ckan-version.tsx

@@ -49,7 +49,7 @@ export default function PresetsBuilderSection({
             setConfig({
               ...config,
               preset: "dathere-default",
-              ckanVersion: "2.11.3",
+              ckanVersion: "2.11.4",
               extensions: ["ckanext-scheming", "DataStore", "DataPusher+"],
               features: ["enable-ssh"],
             });

docs/components/builder-sections/presets.tsx

@@ -1,18 +1,13 @@
 "use client";
 
 import { CodeBlock, Pre } from "fumadocs-ui/components/codeblock";
-import defaultMdxComponents from "fumadocs-ui/mdx";
-import {
-  BarChartBigIcon,
-  BlocksIcon,
-  SailboatIcon,
-  TerminalSquareIcon,
-} from "lucide-react";
+import { Label } from "@/components/ui/label"
+import { Switch } from "@/components/ui/switch"
 import { useEffect, useState } from "react";
-import PresetsBuilderSection from "./builder-sections/presets";
-import CKANVersionBuilderSection from "./builder-sections/ckan-version";
-import CKANExtensionsBuilderSection from "./builder-sections/ckan-extensions";
-import FeaturesBuilderSection from "./builder-sections/features";
+import PresetsBuilderSection from "@/components/builder-sections/presets";
+import CKANVersionBuilderSection from "@/components/builder-sections/ckan-version";
+import CKANExtensionsBuilderSection from "@/components/builder-sections/ckan-extensions";
+import FeaturesBuilderSection from "@/components/builder-sections/features";
 
 export type Config = {
   preset: string | undefined;
@@ -25,11 +20,28 @@ export const selectedCardClasses =
   "bg-blue-100 dark:bg-blue-950 border-blue-300 dark:border-blue-900 border-2";
 
 export default function Builder() {
-  const { Card, Cards } = defaultMdxComponents;
+  const [downloadScript, setDownloadScript] = useState(true);
+  const downloadScriptString = `#!/usr/bin/env bash
+
+# Update/Upgrade system dependencies
+sudo apt update -y
+sudo apt upgrade -y
+
+# Install curl
+sudo apt install curl -y
+
+# Change to the home directory
+cd ~/
+
+# Download the ckan-devstaller binary file
+wget https://github.com/dathere/ckan-devstaller/releases/download/0.3.1/ckan-devstaller
+
+# Add execute permission to ckan-devstaller binary file
+sudo chmod +x ./ckan-devstaller\n\n# Run ckan-devstaller script\n`;
   const [command, setCommand] = useState("./ckan-devstaller");
   const [config, setConfig] = useState<Config>({
     preset: "ckan-only",
-    ckanVersion: "2.11.3",
+    ckanVersion: "2.11.4",
     extensions: [],
     features: [],
   });
@@ -56,8 +68,12 @@ ${ckanVersionString}${extensionsString ? extensionsString : ""}${featuresString
       <div className="md:col-span-1 md:border-r-2 md:pr-4">
         <div className="sticky top-8">
           <h2>ckan-devstaller command</h2>
+          <div className="flex items-center space-x-2">
+            <Switch defaultChecked={downloadScript} onCheckedChange={() => setDownloadScript(!downloadScript)} id="download-script" />
+            <Label htmlFor="download-script">Include download script?</Label>
+          </div>
           <CodeBlock title="Installation command">
-            <Pre className="text-wrap pl-4 max-w-[21rem]">{command}</Pre>
+            <Pre className="text-wrap pl-4 max-w-[21rem]">{downloadScript ? downloadScriptString : ""}{command}</Pre>
           </CodeBlock>
           <h2>Selected configuration</h2>
           <div>

docs/components/builder.tsx

@@ -0,0 +1,26 @@
+"use client"
+
+import * as React from "react"
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/lib/utils"
+
+const labelVariants = cva(
+  "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+)
+
+const Label = React.forwardRef<
+  React.ElementRef<typeof LabelPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
+    VariantProps<typeof labelVariants>
+>(({ className, ...props }, ref) => (
+  <LabelPrimitive.Root
+    ref={ref}
+    className={cn(labelVariants(), className)}
+    {...props}
+  />
+))
+Label.displayName = LabelPrimitive.Root.displayName
+
+export { Label }

docs/components/ui/label.tsx

@@ -0,0 +1,29 @@
+"use client"
+
+import * as React from "react"
+import * as SwitchPrimitives from "@radix-ui/react-switch"
+
+import { cn } from "@/lib/utils"
+
+const Switch = React.forwardRef<
+  React.ElementRef<typeof SwitchPrimitives.Root>,
+  React.ComponentPropsWithoutRef<typeof SwitchPrimitives.Root>
+>(({ className, ...props }, ref) => (
+  <SwitchPrimitives.Root
+    className={cn(
+      "peer inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-green-500 data-[state=unchecked]:bg-gray-500 dark:data-[state=checked]:bg-blue-500 dark:data-[state=unchecked]:bg-gray-600",
+      className
+    )}
+    {...props}
+    ref={ref}
+  >
+    <SwitchPrimitives.Thumb
+      className={cn(
+        "pointer-events-none block h-5 w-5 rounded-full bg-white dark:bg-blue-800 shadow-lg ring-0 transition-transform data-[state=checked]:translate-x-5 data-[state=unchecked]:translate-x-0"
+      )}
+    />
+  </SwitchPrimitives.Root>
+))
+Switch.displayName = SwitchPrimitives.Root.displayName
+
+export { Switch }