chore: merge main into next
This commit is contained in:
jamesgeorge007
commit
84dc586582
2 changed files with 48 additions and 23 deletions
63
.github/workflows/release-push-docker.yml
vendored
63
.github/workflows/release-push-docker.yml
vendored
|
|
@ -4,17 +4,20 @@ on:
|
|||
push:
|
||||
tags:
|
||||
- '*.*.*'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
# NO INPUTS
|
||||
|
||||
jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
platform: [
|
||||
{ platform: linux/amd64, cache: docker-release-amd64 },
|
||||
{ platform: linux/arm64, cache: docker-release-arm64 },
|
||||
]
|
||||
# strategy:
|
||||
# matrix:
|
||||
# platform: [
|
||||
# { platform: linux/amd64, cache: docker-release-amd64 },
|
||||
# { platform: linux/arm64, cache: docker-release-arm64 },
|
||||
# ]
|
||||
runs-on: ubuntu-latest
|
||||
continue-on-error: true # We can continue each platform deployment if the other fails
|
||||
# continue-on-error: true # We can continue each platform deployment if the other fails
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
|
@ -36,30 +39,42 @@ jobs:
|
|||
|
||||
- name: Build and push the backend container
|
||||
uses: docker/build-push-action@v4
|
||||
if: false # TODO: Temporary, remove later
|
||||
with:
|
||||
context: .
|
||||
file: ./prod.Dockerfile
|
||||
target: backend
|
||||
push: true
|
||||
cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
# cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
# cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
cache-from: type=gha,timeout=200m,scope=docker-release-allarch
|
||||
cache-to: type=gha,mode=max,timeout=200m,scope=docker-release-allarch
|
||||
# platforms: |
|
||||
# ${{ matrix.platform.platform }}
|
||||
platforms: |
|
||||
${{ matrix.platform.platform }}
|
||||
linux/amd64
|
||||
linux/arm64
|
||||
tags: |
|
||||
${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}:latest
|
||||
${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}:${{ github.ref_name }}
|
||||
|
||||
- name: Build and push the frontend container
|
||||
uses: docker/build-push-action@v4
|
||||
if: false # TODO: Temporary, remove later
|
||||
with:
|
||||
context: .
|
||||
file: ./prod.Dockerfile
|
||||
target: app
|
||||
push: true
|
||||
cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
# cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
# cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
cache-from: type=gha,timeout=200m,scope=docker-release-allarch
|
||||
cache-to: type=gha,mode=max,timeout=200m,scope=docker-release-allarch
|
||||
# platforms: |
|
||||
# ${{ matrix.platform.platform }}
|
||||
platforms: |
|
||||
${{ matrix.platform.platform }}
|
||||
linux/amd64
|
||||
linux/arm64
|
||||
tags: |
|
||||
${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}:latest
|
||||
${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}:${{ github.ref_name }}
|
||||
|
|
@ -71,10 +86,15 @@ jobs:
|
|||
file: ./prod.Dockerfile
|
||||
target: sh_admin
|
||||
push: true
|
||||
cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
# cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
# cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
cache-from: type=gha,timeout=200m,scope=docker-release-allarch
|
||||
cache-to: type=gha,mode=max,timeout=200m,scope=docker-release-allarch
|
||||
# platforms: |
|
||||
# ${{ matrix.platform.platform }}
|
||||
platforms: |
|
||||
${{ matrix.platform.platform }}
|
||||
linux/amd64
|
||||
linux/arm64
|
||||
tags: |
|
||||
${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}:latest
|
||||
${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}:${{ github.ref_name }}
|
||||
|
|
@ -86,10 +106,15 @@ jobs:
|
|||
file: ./prod.Dockerfile
|
||||
target: aio
|
||||
push: true
|
||||
cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
# cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
# cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }}
|
||||
cache-from: type=gha,timeout=200m,scope=docker-release-allarch
|
||||
cache-to: type=gha,mode=max,timeout=200m,scope=docker-release-allarch
|
||||
# platforms: |
|
||||
# ${{ matrix.platform.platform }}
|
||||
platforms: |
|
||||
${{ matrix.platform.platform }}
|
||||
linux/amd64
|
||||
linux/arm64
|
||||
tags: |
|
||||
${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_AIO_CONTAINER_NAME }}:latest
|
||||
${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_AIO_CONTAINER_NAME }}:${{ github.ref_name }}
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@ Access Hoppscotch Cloud Edition from Hoppscotch Desktop App:
|
|||
> [!Note]
|
||||
> To enable desktop app support for your self-hosted Hoppscotch instance, make sure to update the `WHITELISTED_ORIGINS` environment variable in your `.env` file with your deployment URL.
|
||||
>
|
||||
> e.g. to allow connection to `https://hoppscotch.mydomain.com` you need to add `app://hoppscotch_mydomain_com` to the `WHITELISTED_ORIGINS` environment variable.
|
||||
> e.g. to allow connection to `https://hoppscotch.mydomain.com` you need to add `app://hoppscotch_mydomain_com` (MacOS, Linux) and `http://app.hoppscotch_mydomain_com` (Windows) to the `WHITELISTED_ORIGINS` environment variable.
|
||||
> ```bash
|
||||
> WHITELISTED_ORIGINS=...existing_origins,app://hoppscotch_mydomain_com
|
||||
> WHITELISTED_ORIGINS=...existing_origins,app://hoppscotch_mydomain_com,http://app.hoppscotch_mydomain_com
|
||||
> ```
|
||||
|
||||
Add your self-hosted Hoppscotch Community Edition instance to Hoppscotch Desktop App:
|
||||
|
|
@ -92,9 +92,9 @@ Add your self-hosted Hoppscotch Community Edition instance to Hoppscotch Desktop
|
|||
> [!Note]
|
||||
> To enable desktop app support for your self-hosted Hoppscotch instance, make sure to update the `WHITELISTED_ORIGINS` environment variable in your `.env` file with your deployment URL.
|
||||
>
|
||||
> e.g. to allow connection to `https://hoppscotch.mydomain.com` you need to add `app://hoppscotch_mydomain_com` to the `WHITELISTED_ORIGINS` environment variable.
|
||||
> e.g. to allow connection to `https://hoppscotch.mydomain.com` you need to add `app://hoppscotch_mydomain_com` (MacOS, Linux) and `http://app.hoppscotch_mydomain_com` (Windows) to the `WHITELISTED_ORIGINS` environment variable.
|
||||
> ```bash
|
||||
> WHITELISTED_ORIGINS=...existing_origins,app://hoppscotch_mydomain_com
|
||||
> WHITELISTED_ORIGINS=...existing_origins,app://hoppscotch_mydomain_com,http://app.hoppscotch_mydomain_com
|
||||
> ```
|
||||
|
||||
Add your self-hosted Hoppscotch Enterprise Edition instance to Hoppscotch Desktop App:
|
||||
|
|
|
|||
Loading…
Reference in a new issue