diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..afb0fd9 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +.woodpecker.yml +docker diff --git a/.woodpecker.yml b/.woodpecker.yml index 730baed..e428106 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,8 @@ steps: image: docker:dind environment: COMPOSE_PROJECT_NAME: ${CI_REPO_OWNER,,}-${CI_REPO_NAME,,}-${CI_COMMIT_BRANCH//\//-} - SERVICE_3000_TAGS: urlprefix-librodrome.org/* + LETSENCRYPT_HOST: librodrome.org + SERVICE_3000_TAGS: urlprefix-librodrome.org:443/* NUXT_PUBLIC_SITE_URL: https://librodrome.org NUXT_ADMIN_PASSWORD: from_secret: NUXT_ADMIN_PASSWORD diff --git a/docker/Dockerfile b/docker/Dockerfile index 60bddfa..c8d0e12 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,6 +26,9 @@ ENV PORT=${PORT} ENV NODE_ENV=production COPY --from=build /src/.output /src/.output +COPY --from=build /src/site /src/site + +RUN apt-get update && apt-get -fy install curl && rm -rf /var/cache/apt/* HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \ CMD curl -f http://localhost:${PORT}/api/health || exit 1 diff --git a/server/utils/content.ts b/server/utils/content.ts index 539be81..81c8c03 100644 --- a/server/utils/content.ts +++ b/server/utils/content.ts @@ -2,7 +2,7 @@ import { readFile, writeFile } from 'node:fs/promises' import { join } from 'node:path' import yaml from 'yaml' -const dataDir = join(process.cwd(), 'data') +const dataDir = join(process.cwd(), 'site') const cache = new Map() diff --git a/data/librodrome.config.yml b/site/librodrome.config.yml similarity index 100% rename from data/librodrome.config.yml rename to site/librodrome.config.yml diff --git a/data/messages.yml b/site/messages.yml similarity index 100% rename from data/messages.yml rename to site/messages.yml diff --git a/data/pages/book-player.yml b/site/pages/book-player.yml similarity index 100% rename from data/pages/book-player.yml rename to site/pages/book-player.yml diff --git a/data/pages/ecouter.yml b/site/pages/ecouter.yml similarity index 100% rename from data/pages/ecouter.yml rename to site/pages/ecouter.yml diff --git a/data/pages/gratewizard.yml b/site/pages/gratewizard.yml similarity index 100% rename from data/pages/gratewizard.yml rename to site/pages/gratewizard.yml diff --git a/data/pages/home.yml b/site/pages/home.yml similarity index 100% rename from data/pages/home.yml rename to site/pages/home.yml diff --git a/data/pages/lire.yml b/site/pages/lire.yml similarity index 100% rename from data/pages/lire.yml rename to site/pages/lire.yml diff --git a/data/site.yml b/site/site.yml similarity index 100% rename from data/site.yml rename to site/site.yml