From eebbda99dc0de167a7aba6d86a022c42a0f317c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Cort=C3=A9s?= Date: Mon, 13 Dec 2021 21:50:55 -0300 Subject: [PATCH] Transformando a docker --- .dockerignore | 3 +++ Dockerfile | 15 +++++++++++++++ generator | 34 +--------------------------------- requirements.txt | 1 - src/index.md | 2 +- sync | 3 --- 6 files changed, 20 insertions(+), 38 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile delete mode 100755 sync diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..019408a --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +venv/ +.git/ +www/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c46cb69 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM python:3 as builder + +WORKDIR /usr/src/app + +COPY requirements.txt . +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . +RUN mkdir www/ + +RUN python generator + +########################################################### +FROM nginx:latest as deployer +COPY --from=builder /usr/src/app/www /usr/share/nginx/html diff --git a/generator b/generator index 1004b0f..c423c23 100755 --- a/generator +++ b/generator @@ -5,9 +5,6 @@ import time import shutil from pathlib import Path from markdown import markdown -from watchdog.observers import Observer -from watchdog.events import PatternMatchingEventHandler - src_dir = Path('src') out_dir = Path('www') @@ -75,35 +72,6 @@ def execute(): print('parsing {} as any'.format(path)) process_any(path) -class WatchHandler(PatternMatchingEventHandler): - patterns = ["*.py", "*.md", "*.css", "*.js"] - - def process(self, event): - execute() - - def on_modified(self, event): - self.process(event) - - def on_created(self, event): - self.process(event) - if __name__ == '__main__': - if len(sys.argv) > 1 and sys.argv[1] == '--watch': - observer = Observer() - observer.schedule(WatchHandler(), str(src_dir), recursive=True) - observer.start() - - try: - while True: - time.sleep(1) - except KeyboardInterrupt: - observer.stop() - - observer.join() - else: - execute() - - - - + execute() diff --git a/requirements.txt b/requirements.txt index 8f5d02f..0c8edb2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ markdown pygments -watchdog diff --git a/src/index.md b/src/index.md index 8f61d9b..81cb4d9 100755 --- a/src/index.md +++ b/src/index.md @@ -18,7 +18,7 @@ El codigo que he escrito para distintos proyectos lo mantengo en intento mantener de las redes sociales. Y finalmente, si me quieres enviar un correo, mi dirección es hola@danielcortes.xyz -##[Posts](/blog) +##[Posts](/blog/index.html) Aqui posteo lo que intento escribir una vez al año. Me cuesta conseguir ideas y ganas para sentarme a escribir algo pero me agrada tener la posibilidad aqui. diff --git a/sync b/sync deleted file mode 100755 index 80f3608..0000000 --- a/sync +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/bash - -rsync -av www/ zgh:www-dir/www.danielcortes.xyz/