diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b9873e1..3f44b36 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,15 +7,16 @@ jobs: container: volumes: - /var/docker-web:/var/docker-web - steps: - uses: actions/checkout@v4 - - name: install + - name: Deploy with docker-web run: | - APP_DIR=/var/docker-web/apps/${GITHUB_REPOSITORY##*/} - mkdir -p $APP_DIR + REPO_NAME="${GITHUB_REPOSITORY##*/}" + APP_DIR="/var/docker-web/apps/${REPO_NAME}" + bash /var/docker-web/src/cli.sh down "${REPO_NAME}" + rm -rf "$APP_DIR" + mkdir "$APP_DIR" cp -a $(find . -mindepth 1 -maxdepth 1 ! -name '.git' ! -name 'node_modules') "$APP_DIR/" - - name: up - run: | export COMPOSE_BAKE=false - bash /var/docker-web/src/cli.sh up ${GITHUB_REPOSITORY##*/} + docker rmi "local/${REPO_NAME}" + bash /var/docker-web/src/cli.sh up "${REPO_NAME}" diff --git a/Dockerfile b/Dockerfile index c19b612..9694b1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,18 +3,10 @@ FROM node:20-alpine AS build WORKDIR /app -# Installer pnpm RUN npm install -g pnpm - -# Copier package.json et lockfile pour cache pnpm COPY package.json pnpm-lock.yaml* ./ - RUN pnpm install --frozen-lockfile - -# Copier tout le projet COPY . . - -# Build Nuxt RUN pnpm build # Stage production diff --git a/app/components/applications-list.vue b/app/components/applications-list.vue index 33072f7..8a8cfd8 100644 --- a/app/components/applications-list.vue +++ b/app/components/applications-list.vue @@ -30,7 +30,7 @@ export default {