diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index a140278..c321265 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -22,43 +22,37 @@ jobs: - name: 🪚 Build app run: | - cd client npm ci npm run build -- --mode staging - - name: 🏷️ Get tag - id: tag - run: echo "tag=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT - - name: 🔑 Login Docker run: docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} - name: 🐳 Build Docker image run: | - cd client - IMAGE_ID=ghcr.io/${{ github.repository }} + IMAGE_ID=ghcr.io/dataesr/ticket-office IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') - docker build -f Dockerfile -t $IMAGE_ID:${{ steps.tag.outputs.tag }} . + docker build -t $IMAGE_ID:staging . - name: 📦 Push Docker image run: | - IMAGE_ID=ghcr.io/${{ github.repository }} + IMAGE_ID=ghcr.io/dataesr/ticket-office IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]') docker push --all-tags $IMAGE_ID - deploy: - name: 💭 Update staging deployment - runs-on: ubuntu-latest - needs: publish-ghcr - steps: - - name: Deploy to Cluster - id: kubectl-deploy - uses: dataesr/kubectl-deploy@v1.1 - env: - KUBE_CONFIG: ${{ secrets.KUBE_CONFIG_DOAD_STAGING }} - with: - namespace: ${{ env.DEPLOYMENT_NAMESPACE }} - restart: ${{ env.DEPLOYMENT }} + # deploy: + # name: 💭 Update staging deployment + # runs-on: ubuntu-latest + # needs: publish-ghcr + # steps: + # - name: Deploy to Cluster + # id: kubectl-deploy + # uses: dataesr/kubectl-deploy@v1.1 + # env: + # KUBE_CONFIG: ${{ secrets.KUBE_CONFIG_DOAD_STAGING }} + # with: + # namespace: ${{ env.DEPLOYMENT_NAMESPACE }} + # restart: ${{ env.DEPLOYMENT }} notify: name: 📢 Notify in mattermost channel diff --git a/docker-compose.yml b/docker-compose.yml index 2b5a0dc..01d797c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,11 @@ -version: "3.8" - services: app: - image: node:18-alpine + image: ghcr.io/dataesr/ticket-office working_dir: /app - volumes: - - .:/app + ports: - - "3000:3000" + - "5173:5173" + environment: - NODE_ENV=staging - VITE_SCANR_API_AUTORIZATION=${VITE_SCANR_API_AUTORIZATION} diff --git a/package-lock.json b/package-lock.json index 1270007..c3686de 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6203,4 +6203,4 @@ } } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 25668cc..7655551 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "scanR-contact-v2", + "name": "ticket-office", "private": true, "version": "0.0.0", "type": "module",