update container

Author: Tsche

.devcontainer/Dockerfile

@@ -1,40 +1,13 @@
-FROM antora/antora
-ARG MRDOCS_VERSION=0.8.0
+FROM ghcr.io/fuquery/fedora_devcontainer:latest
 
-
-RUN apk add --no-cache \
-bash \
-curl \
-git \
-ruby \
-ruby-dev \
-build-base \
-libxml2-dev \
-libxslt-dev \
-tar
+RUN dnf install -y ruby pip ruby-devel redhat-rpm-config yarnpkg
 
 RUN gem install --no-document rouge nokogiri
 
-RUN apk add --no-cache python3 py3-pip
-
-RUN pip install pyyaml
-RUN pip install watchdog
-
+RUN yarn global add @antora/cli
+RUN yarn global add @antora/site-generator
 RUN yarn global add @antora/lunr-extension
 RUN yarn global add @antora/collector-extension
 
-RUN apk add --no-cache curl tar xz \
- && curl -L https://github.com/cppalliance/mrdocs/releases/download/v${MRDOCS_VERSION}/MrDocs-${MRDOCS_VERSION}-Linux.tar.xz \
-    -o /tmp/mrdocs.tar.xz \
- && mkdir -p /opt/mrdocs \
- && tar -xJf /tmp/mrdocs.tar.xz -C /opt/mrdocs --strip-components=1 \
- && rm /tmp/mrdocs.tar.xz \
- && ln -s /opt/mrdocs/bin/mrdocs /usr/local/bin/mrdocs
-
-# Patch code blocks for use with rouge
-# COPY .devcontainer/code-block.patch /opt/mrdocs/code-block.patch
-# RUN patch -p1 -d /opt/mrdocs < /opt/mrdocs/code-block.patch
-# RUN rm /opt/mrdocs/code-block.patch
-
-USER node
-
+RUN pip install --no-input --root-user-action=ignore pyyaml
+RUN pip install --no-input --root-user-action=ignore git+https://github.com/tsche/claudoc.git

.devcontainer/code-block.patch

@@ -18,13 +18,6 @@
     print("Missing required dependency 'PyYAML'. Install with: pip install pyyaml", file=sys.stderr)
     sys.exit(1)
 
-try:
-    from watchdog.observers import Observer
-    from watchdog.events import FileSystemEventHandler
-except Exception:
-    Observer = None
-    FileSystemEventHandler = None
-
 
 def parse_playbook(playbook_path: Path):
     data = yaml.safe_load(playbook_path.read_text(encoding='utf-8')) or {}
@@ -69,106 +62,6 @@ def clean_site(site_dir: Path):
         print('Nothing to remove at', site_dir)
 
 
-def serve_dir(site_dir: Path, host: str, port: int):
-    handler = http.server.SimpleHTTPRequestHandler
-    os.chdir(site_dir)
-    with socketserver.ThreadingTCPServer((host, port), handler) as httpd:
-        print(f'Serving {site_dir} at http://{host}:{port}/')
-        try:
-            httpd.serve_forever()
-        except KeyboardInterrupt:
-            pass
-
-
-def preview(playbook: Path, site_dir: Path, paths_to_watch, interval, host, port):
-    if Observer is None or FileSystemEventHandler is None:
-        print("Missing optional dependency 'watchdog'. Install with: pip3 install watchdog", file=sys.stderr)
-        sys.exit(1)
-
-    if not site_dir.exists():
-        run_build(playbook)
-    chosen_site = site_dir
-
-    class Handler(FileSystemEventHandler):
-        def __init__(self, build_cb, debounce=0.5):
-            self.build_cb = build_cb
-            self.debounce = debounce
-            self._timer = None
-            self._lock = threading.Lock()
-
-        def _trigger_build(self):
-            try:
-                self.build_cb()
-            finally:
-                with self._lock:
-                    self._timer = None
-
-        def _debounce(self):
-            with self._lock:
-                if self._timer:
-                    self._timer.cancel()
-                t = threading.Timer(self.debounce, self._trigger_build)
-                self._timer = t
-                t.daemon = True
-                t.start()
-
-        # Trigger rebuild on create/delete/move/modify for files
-        def on_created(self, event):
-            if not event.is_directory:
-                self._debounce()
-
-        def on_deleted(self, event):
-            if not event.is_directory:
-                self._debounce()
-
-        def on_moved(self, event):
-            if not event.is_directory:
-                self._debounce()
-
-        def on_modified(self, event):
-            if not event.is_directory:
-                self._debounce()
-
-    observer = Observer()
-    handler = Handler(lambda *args: run_build(playbook), debounce=interval)
-    for p in paths_to_watch:
-        if p.exists() and p.is_dir():
-            target = p
-        elif p.exists():
-            target = p.parent
-        else:
-            target = p
-        try:
-            print(p, paths_to_watch)
-            observer.schedule(handler, str(target), recursive=True)
-        except Exception:
-            print(f'Warning: failed to watch {target}')
-
-    os.chdir(chosen_site)
-    httpd = socketserver.ThreadingTCPServer((host, port), http.server.SimpleHTTPRequestHandler)
-    server_thread = threading.Thread(target=httpd.serve_forever)
-    server_thread.start()
-    observer.start()
-
-    try:
-        while True:
-            time.sleep(1)
-    except KeyboardInterrupt:
-        print('Shutting down...')
-        observer.stop()
-        observer.join()
-        try:
-            httpd.shutdown()
-        except Exception:
-            pass
-        server_thread.join()
-        try:
-            httpd.server_close()
-        except Exception:
-            pass
-        print('Stopping preview')
-
-
 def find_site_dir(base: Path):
     if (path := base / 'build' / 'site').exists():
         return path
@@ -182,11 +75,7 @@ def main():
     sub = parser.add_subparsers(dest='cmd')
     sub.add_parser('build')
     sub.add_parser('clean')
-    preview_p = sub.add_parser('preview')
-    preview_p.add_argument('--interval', type=float, default=1.0)
-    preview_p.add_argument('--host', default='0.0.0.0')
-    preview_p.add_argument('--port', type=int, default=8000)
-
+  
     args = parser.parse_args()
     playbook = args.playbook
     if not playbook.exists():
@@ -198,9 +87,6 @@ def main():
         run_build(playbook)
     elif args.cmd == 'clean':
         clean_site(site_dir)
-    elif args.cmd == 'preview':
-        paths = parse_playbook(playbook)
-        preview(playbook, site_dir, paths, args.interval, args.host, args.port)
     else:
         parser.print_help()