Skip to content

Commit

Permalink
Merge branch 'dev' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
shubham3121 authored Aug 1, 2022
2 parents 4b50f57 + 7ba9a69 commit 2cda186
Show file tree
Hide file tree
Showing 11 changed files with 623 additions and 554 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.7.0-beta.32
current_version = 0.7.0-beta.35
tag = False
tag_name = {new_version}
commit = True
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ jobs:
run: echo "GRID_VERSION=$(python packages/grid/VERSION)" >> $GITHUB_ENV

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Login to Docker
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_LOGIN }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -118,6 +118,7 @@ jobs:
context: ./packages
file: ./packages/grid/backend/backend.dockerfile
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta_grid_backend.outputs.tags }}
target: backend

Expand All @@ -136,6 +137,7 @@ jobs:
context: ./packages/grid/frontend
file: ./packages/grid/frontend/frontend.dockerfile
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta_grid_frontend.outputs.tags }}
target: grid-ui-production

Expand All @@ -154,6 +156,7 @@ jobs:
context: ./packages/grid/vpn
file: ./packages/grid/vpn/headscale.dockerfile
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta_grid_headscale.outputs.tags }}

- name: Docker meta for Grid-Tailscale
Expand All @@ -171,6 +174,7 @@ jobs:
context: ./packages/grid/vpn
file: ./packages/grid/vpn/tailscale.dockerfile
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta_grid_tailscale.outputs.tags }}

- name: Docker meta for grid-vpn-iptables
Expand All @@ -188,4 +192,5 @@ jobs:
context: ./packages/grid/vpn
file: ./packages/grid/vpn/iptables.dockerfile
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta_grid_vpn_iptables.outputs.tags }}
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.7.0-beta.32"
__version__ = "0.7.0-beta.35"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
2 changes: 1 addition & 1 deletion docs/source/install_tutorials/linux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ A very convenient way to interact with a deployed node is via Python, using a Ju

.. code-block:: bash
pip install jupyter-notebook
pip install jupyterlab
If you encounter issues, you can also install it using Conda:

Expand Down
2 changes: 1 addition & 1 deletion packages/grid/VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.7.0-beta.32"
__version__ = "0.7.0-beta.35"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
10 changes: 5 additions & 5 deletions packages/grid/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ images:
tags:
- "######"
- latest
- "0.7.0-beta.32"
- "0.7.0-beta.35"
createPullSecret: true
dockerfile: ./backend/backend.dockerfile
context: ../
Expand All @@ -107,7 +107,7 @@ images:
tags:
- "######"
- latest
- "0.7.0-beta.32"
- "0.7.0-beta.35"
createPullSecret: true
dockerfile: ./frontend/frontend.dockerfile
context: ./frontend
Expand All @@ -126,7 +126,7 @@ images:
tags:
- "######"
- latest
- "0.7.0-beta.32"
- "0.7.0-beta.35"
createPullSecret: true
dockerfile: ./vpn/headscale.dockerfile
context: ./vpn
Expand All @@ -138,7 +138,7 @@ images:
tags:
- "######"
- latest
- "0.7.0-beta.32"
- "0.7.0-beta.35"
createPullSecret: true
dockerfile: ./vpn/tailscale.dockerfile
context: ./vpn
Expand All @@ -150,7 +150,7 @@ images:
tags:
- "######"
- latest
- "0.7.0-beta.32"
- "0.7.0-beta.35"
createPullSecret: true
dockerfile: ./vpn/iptables.dockerfile
context: ./vpn
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pygrid-ui",
"version": "0.7.0-beta.32",
"version": "0.7.0-beta.35",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
2 changes: 1 addition & 1 deletion packages/grid/frontend/src/pages/_domain/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default function Login() {
<Text className="text-gray-600 text-center">
{t('running-version')}{' '}
<span className="text-gray-800">
{settings?.version ?? '0.7.0-beta.32'}
{settings?.version ?? '0.7.0-beta.35'}
</span>{' '}
<BetaBadge />
</Text>
Expand Down
Loading

0 comments on commit 2cda186

Please sign in to comment.