From ae0eb4ff2b7d9ad56602280f352c5eae1cee76d3 Mon Sep 17 00:00:00 2001 From: Yann Autissier Date: Fri, 6 Dec 2024 00:46:45 +0000 Subject: [PATCH] publish website when push on main --- .drone.yml | 30 ++++++++++++++++++++++++------ docker/Dockerfile | 5 +++++ docker/docker-compose.testing.yml | 7 +++++++ 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 docker/docker-compose.testing.yml diff --git a/.drone.yml b/.drone.yml index b80cfe1..9eae1f1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,16 +7,34 @@ steps: - name: build image: docker:dind environment: - COMPOSE_PROJECT_NAME: adv-testing-${DRONE_COMMIT_BRANCH//\//-} - NUXT_APP_BASE_URL: /adv/${DRONE_COMMIT_BRANCH}/ - SERVICE_3000_CHECK_HTTP: /adv/${DRONE_COMMIT_BRANCH}/ - SERVICE_3000_TAGS: urlprefix-testing.asycn.io/adv/${DRONE_COMMIT_BRANCH}/* + COMPOSE_PROJECT_NAME: dav-testing-${DRONE_COMMIT_BRANCH//\//-} + NUXT_APP_BASE_URL: /${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/${DRONE_COMMIT_BRANCH}/ + SERVICE_3000_CHECK_HTTP: /${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/${DRONE_COMMIT_BRANCH}/ + SERVICE_3000_TAGS: urlprefix-testing.asycn.io/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/${DRONE_COMMIT_BRANCH}/* commands: - - docker compose -f docker/docker-compose.yml -f docker/docker-compose.labels.yml up --build -d + - docker compose -f docker/docker-compose.yml -f docker/docker-compose.labels.yml -f docker/docker-compose.testing.yml up --build -d volumes: - name: dockersock path: /var/run/docker.sock +- name: publish + image: cschlosser/drone-ftps + environment: + FTP_USERNAME: + from_secret: ftp_username + FTP_PASSWORD: + from_secret: ftp_password + PLUGIN_HOSTNAME: open.us.org:21 + PLUGIN_SRC_DIR: /.output/public/ + PLUGIN_DEST_DIR: /dav/www/ + PLUGIN_SECURE: true + PLUGIN_VERIFY: false + when: + branch: + - main + event: + - push + - name: notify image: appleboy/drone-telegram when: @@ -35,7 +53,7 @@ steps: ``` {{commit.message}} ``` - 🌐 https://testing.asycn.io/adv/{{commit.branch}}/ + 🌐 https://testing.asycn.io/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}/{{commit.branch}}/ {{else}} ❌ Le build #{{build.number}} du repo `{{repo.name}}` est un gros fail... 📝 Commit de {{commit.email}} sur la branche `{{commit.branch}}`: diff --git a/docker/Dockerfile b/docker/Dockerfile index 313ff96..8cd4341 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,9 +9,14 @@ COPY --link ./ ./ FROM build AS master RUN npm run build +RUN npm run generate FROM base AS prod ENV NODE_ENV=production # COPY --from=build /app/node_modules /app/node_modules COPY --from=master /app/.output /app/.output +COPY --from=master /app/.output/public /drone/src/.output +RUN echo app && ls -la /app/.output/ +RUN echo src && ls -la /drone/src/ +RUN echo output && ls -la /drone/src/.output CMD [ "node", ".output/server/index.mjs" ] diff --git a/docker/docker-compose.testing.yml b/docker/docker-compose.testing.yml new file mode 100644 index 0000000..1106e12 --- /dev/null +++ b/docker/docker-compose.testing.yml @@ -0,0 +1,7 @@ +version: "3" + +services: + front: + volumes: + - /drone/src:/drone/src +