diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml index cd705f0c..73a0f6db 100644 --- a/.gitea/workflows/deployProd.yml +++ b/.gitea/workflows/deployProd.yml @@ -6,20 +6,32 @@ on: types: [published] jobs: - CreateImage: - runs-on: [skeris] - uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p - with: - runner: skeris - secrets: - REGISTRY_USER: ${{ secrets.REGISTRY_USER }} - REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} - DeployService: - runs-on: [frontprod] - needs: CreateImage - uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 - with: - runner: hubprod - actionid: ${{ gitea.run_id }} - - + # CreateImage: + # runs-on: [skeris] + # uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p + # with: + # runner: skeris + # secrets: + # REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + # REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + # DeployService: + # runs-on: [frontprod] + # needs: CreateImage + # uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 + # with: + # runner: hubprod + # actionid: ${{ gitea.run_id }} + # + DeployService: + if: contains(github.event.package.name, 'main') + runs-on: [frontprod] + container: + image: gitea.pena/penadevops/container-images/node-compose:main + env: + GITHUB_RUN_NUMBER: "${{ inputs.actionid }}" + volumes: + - /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock + steps: + - name: Check out repository code + uses: http://gitea.pena/PenaDevops/actions.git/checkout@v1 + - run: compose -f deployments/main/docker-compose.yaml up -d diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index ce954b76..17511817 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -2,6 +2,7 @@ services: squiz: container_name: squiz restart: unless-stopped - image: gitea.pena/squiz/frontpanel/main:$GITHUB_RUN_NUMBER + image: gitea.pena/squiz/frontpanel/main:latest hostname: squiz tty: true + pull_policy: always diff --git a/package.json b/package.json index e356838d..2df40939 100755 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "test": "craco test", "eject": "craco eject", "code:format": "prettier --write --ignore-unknown", - "deploy": "docker login gitea.pena && docker build -t gitea.pena/squiz/frontpanel/$(git branch --show-current):latest . && docker push gitea.pena/squiz/frontpanel/$(git branch --show-current):latest", + "deploy": "podman login gitea.pena && podman build -t gitea.pena/squiz/frontpanel/$(git branch --show-current):latest . && podman push gitea.pena/squiz/frontpanel/$(git branch --show-current):latest", "prepare": "husky install", "cypress:open": "cypress open", "cypress:run": "cypress run" diff --git a/src/assets/icons/logo/PostbackLogo.tsx b/src/assets/icons/logo/PostbackLogo.tsx new file mode 100644 index 00000000..daff6059 --- /dev/null +++ b/src/assets/icons/logo/PostbackLogo.tsx @@ -0,0 +1,10 @@ +import { Box, SxProps } from "@mui/material"; +import PostbackDefault from "./Postback"; +import PostbackPC from "./PostbackPC"; + +export const PostbackLogo = (sx: SxProps) => ( + + + + +); \ No newline at end of file diff --git a/src/assets/icons/logo/ZapierLogo.tsx b/src/assets/icons/logo/ZapierLogo.tsx new file mode 100644 index 00000000..3b06b61b --- /dev/null +++ b/src/assets/icons/logo/ZapierLogo.tsx @@ -0,0 +1,15 @@ +import { Box, SxProps } from "@mui/material"; + +export const ZapierLogo = (sx: SxProps) => ( + +); \ No newline at end of file