Skip to content

Commit

Permalink
Merge pull request #8244 from OpenMined/rasswanth/modify-cache-to-reg…
Browse files Browse the repository at this point in the history
…istry

modified to registry cache
  • Loading branch information
rasswanth-s authored Nov 11, 2023
2 parents 9b19791 + cd2f7fd commit b70e80f
Show file tree
Hide file tree
Showing 18 changed files with 84 additions and 50 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.8.2-beta.56
current_version = 0.8.2-beta.58
tag = False
tag_name = {new_version}
commit = True
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/cd-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ jobs:
fi
if [[ ${{matrix.runner}} == *"x64"* ]]; then
echo "release_platform=linux/amd64" >> $GITHUB_OUTPUT
echo "short_release_platform=amd64" >> $GITHUB_OUTPUT
else
echo "release_platform=linux/arm64" >> $GITHUB_OUTPUT
echo "short_release_platform=arm64" >> $GITHUB_OUTPUT
fi
echo "grid_version=$(python packages/grid/VERSION)" >> $GITHUB_OUTPUT
Expand All @@ -124,8 +126,8 @@ jobs:
platforms: ${{ steps.release_metadata.outputs.release_platform }}
target: backend
outputs: type=image,name=openmined/grid-backend,push-by-digest=true,name-canonical=true,push=true
cache-from: type=gha
cache-to: type=gha,mode=max
cache-from: type=registry,ref=openmined/grid-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }}
cache-to: type=registry,ref=openmined/grid-backend:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max

- name: Export digest for grid-backend
run: |
Expand All @@ -142,8 +144,8 @@ jobs:
platforms: ${{ steps.release_metadata.outputs.release_platform }}
outputs: type=image,name=openmined/grid-frontend,push-by-digest=true,name-canonical=true,push=true
target: grid-ui-development
cache-from: type=gha
cache-to: type=gha,mode=max
cache-from: type=registry,ref=openmined/grid-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform }}
cache-to: type=registry,ref=openmined/grid-frontend:cache-${{ steps.release_metadata.outputs.short_release_platform}},mode=max

- name: Export digest for grid-frontend
run: |
Expand All @@ -160,8 +162,8 @@ jobs:
platforms: ${{ steps.release_metadata.outputs.release_platform }}
outputs: type=image,name=openmined/grid-enclave,push-by-digest=true,name-canonical=true,push=true
target: worker
cache-from: type=gha
cache-to: type=gha,mode=max
cache-from: type=registry,ref=openmined/grid-enclave:cache-${{ steps.release_metadata.outputs.short_release_platform}}
cache-to: type=registry,ref=openmined/grid-enclave:cache-${{ steps.release_metadata.outputs.short_release_platform }},mode=max

- name: Export digest for grid-enclave
run: |
Expand Down
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.8.2-beta.56"
__version__ = "0.8.2-beta.58"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
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.8.2-beta.56"
__version__ = "0.8.2-beta.58"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
4 changes: 2 additions & 2 deletions packages/grid/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ pipelines:
run: |-
run_dependencies --all
ensure_pull_secrets --all
build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.56 -t dev-latest
build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.58 -t dev-latest
create_deployments --all
vars:
DEVSPACE_ENV_FILE: "default.env"
CONTAINER_REGISTRY: "docker.io"
VERSION: "0.8.2-beta.56"
VERSION: "0.8.2-beta.58"

# This is a list of `images` that DevSpace can build for this project
# We recommend to skip image building during development (devspace dev) as much as possible
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.8.2-beta.56",
"version": "0.8.2-beta.58",
"private": true,
"scripts": {
"dev": "pnpm i && vite dev --host --port 80",
Expand Down
76 changes: 54 additions & 22 deletions packages/grid/helm/repo/index.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
apiVersion: v1
entries:
syft:
- apiVersion: v2
appVersion: 0.8.2-beta.58
created: "2023-11-11T12:45:21.863208402Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
version: 0.9.1
description: Perform numpy-like analysis on data that remains in someone elses
server
digest: c9d89c050a4326e0b43caea0302a3c47011ff4c83ee196635879d99e50ee4aed
icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png
name: syft
type: application
urls:
- https://openmined.github.io/PySyft/helm/syft-0.8.2-beta.58.tgz
version: 0.8.2-beta.58
- apiVersion: v2
appVersion: 0.8.2-beta.57
created: "2023-11-11T12:45:21.862507371Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
version: 0.9.1
description: Perform numpy-like analysis on data that remains in someone elses
server
digest: a038f368398aad3b127d2e0a5ad4770365768b9f30afd966c059860870124b4d
icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png
name: syft
type: application
urls:
- https://openmined.github.io/PySyft/helm/syft-0.8.2-beta.57.tgz
version: 0.8.2-beta.57
- apiVersion: v2
appVersion: 0.8.2-beta.56
created: "2023-11-11T11:37:51.902408204Z"
created: "2023-11-11T12:45:21.861565371Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -19,7 +51,7 @@ entries:
version: 0.8.2-beta.56
- apiVersion: v2
appVersion: 0.8.2-beta.55
created: "2023-11-11T11:37:51.901730093Z"
created: "2023-11-11T12:45:21.860693944Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -35,7 +67,7 @@ entries:
version: 0.8.2-beta.55
- apiVersion: v2
appVersion: 0.8.2-beta.54
created: "2023-11-11T11:37:51.900839426Z"
created: "2023-11-11T12:45:21.859825401Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -51,7 +83,7 @@ entries:
version: 0.8.2-beta.54
- apiVersion: v2
appVersion: 0.8.2-beta.53
created: "2023-11-11T11:37:51.899886684Z"
created: "2023-11-11T12:45:21.858807471Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -67,7 +99,7 @@ entries:
version: 0.8.2-beta.53
- apiVersion: v2
appVersion: 0.8.2-beta.52
created: "2023-11-11T11:37:51.899016625Z"
created: "2023-11-11T12:45:21.857858289Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -83,7 +115,7 @@ entries:
version: 0.8.2-beta.52
- apiVersion: v2
appVersion: 0.8.2-beta.51
created: "2023-11-11T11:37:51.898149242Z"
created: "2023-11-11T12:45:21.855907287Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -99,7 +131,7 @@ entries:
version: 0.8.2-beta.51
- apiVersion: v2
appVersion: 0.8.2-beta.50
created: "2023-11-11T11:37:51.896649644Z"
created: "2023-11-11T12:45:21.85485326Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -115,7 +147,7 @@ entries:
version: 0.8.2-beta.50
- apiVersion: v2
appVersion: 0.8.2-beta.49
created: "2023-11-11T11:37:51.895773134Z"
created: "2023-11-11T12:45:21.853855158Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -131,7 +163,7 @@ entries:
version: 0.8.2-beta.49
- apiVersion: v2
appVersion: 0.8.2-beta.48
created: "2023-11-11T11:37:51.894889971Z"
created: "2023-11-11T12:45:21.852877412Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -147,7 +179,7 @@ entries:
version: 0.8.2-beta.48
- apiVersion: v2
appVersion: 0.8.2-beta.47
created: "2023-11-11T11:37:51.894011026Z"
created: "2023-11-11T12:45:21.851935634Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -163,7 +195,7 @@ entries:
version: 0.8.2-beta.47
- apiVersion: v2
appVersion: 0.8.2-beta.46
created: "2023-11-11T11:37:51.892971814Z"
created: "2023-11-11T12:45:21.850851285Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -179,7 +211,7 @@ entries:
version: 0.8.2-beta.46
- apiVersion: v2
appVersion: 0.8.2-beta.45
created: "2023-11-11T11:37:51.892225706Z"
created: "2023-11-11T12:45:21.850056208Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -195,7 +227,7 @@ entries:
version: 0.8.2-beta.45
- apiVersion: v2
appVersion: 0.8.2-beta.44
created: "2023-11-11T11:37:51.891456936Z"
created: "2023-11-11T12:45:21.849251364Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -211,7 +243,7 @@ entries:
version: 0.8.2-beta.44
- apiVersion: v2
appVersion: 0.8.2-beta.43
created: "2023-11-11T11:37:51.89069062Z"
created: "2023-11-11T12:45:21.848449486Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -227,7 +259,7 @@ entries:
version: 0.8.2-beta.43
- apiVersion: v2
appVersion: 0.8.2-beta.42
created: "2023-11-11T11:37:51.889382206Z"
created: "2023-11-11T12:45:21.846955829Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -243,7 +275,7 @@ entries:
version: 0.8.2-beta.42
- apiVersion: v2
appVersion: 0.8.2-beta.41
created: "2023-11-11T11:37:51.887695248Z"
created: "2023-11-11T12:45:21.846032936Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -259,7 +291,7 @@ entries:
version: 0.8.2-beta.41
- apiVersion: v2
appVersion: 0.8.2-beta.40
created: "2023-11-11T11:37:51.886745372Z"
created: "2023-11-11T12:45:21.844851102Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -275,7 +307,7 @@ entries:
version: 0.8.2-beta.40
- apiVersion: v2
appVersion: 0.8.2-beta.39
created: "2023-11-11T11:37:51.885984496Z"
created: "2023-11-11T12:45:21.844075061Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -291,7 +323,7 @@ entries:
version: 0.8.2-beta.39
- apiVersion: v2
appVersion: 0.8.2-beta.38
created: "2023-11-11T11:37:51.88524446Z"
created: "2023-11-11T12:45:21.843138362Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -307,7 +339,7 @@ entries:
version: 0.8.2-beta.38
- apiVersion: v2
appVersion: 0.8.2-beta.37
created: "2023-11-11T11:37:51.884437559Z"
created: "2023-11-11T12:45:21.842345991Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -323,7 +355,7 @@ entries:
version: 0.8.2-beta.37
- apiVersion: v2
appVersion: 0.8.1
created: "2023-11-11T11:37:51.88358469Z"
created: "2023-11-11T12:45:21.841471197Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -337,4 +369,4 @@ entries:
urls:
- https://openmined.github.io/PySyft/helm/syft-0.8.1.tgz
version: 0.8.1
generated: "2023-11-11T11:37:51.882507156Z"
generated: "2023-11-11T12:45:21.840490908Z"
Binary file added packages/grid/helm/repo/syft-0.8.2-beta.57.tgz
Binary file not shown.
Binary file added packages/grid/helm/repo/syft-0.8.2-beta.58.tgz
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/grid/helm/syft/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: syft
description: Perform numpy-like analysis on data that remains in someone elses server
type: application
version: "0.8.2-beta.56"
appVersion: "0.8.2-beta.56"
version: "0.8.2-beta.58"
appVersion: "0.8.2-beta.58"
icon: https://raw.githubusercontent.com/OpenMined/PySyft/dev/docs/img/title_syft_light.png

dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ data:
RABBITMQ_VERSION: 3
SEAWEEDFS_VERSION: 3.55
DOCKER_IMAGE_SEAWEEDFS: chrislusf/seaweedfs:3.55
VERSION: 0.8.2-beta.56
VERSION: 0.8.2-beta.58
VERSION_HASH: unknown
STACK_API_KEY: ""

Expand Down
4 changes: 2 additions & 2 deletions packages/grid/podman/podman-kube/podman-syft-kube.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- configMapRef:
name: podman-syft-config

image: docker.io/openmined/grid-backend:0.8.2-beta.56
image: docker.io/openmined/grid-backend:0.8.2-beta.58
imagePullPolicy: IfNotPresent
resources: {}
tty: true
Expand All @@ -57,7 +57,7 @@ spec:
envFrom:
- configMapRef:
name: podman-syft-config
image: docker.io/openmined/grid-frontend:0.8.2-beta.56
image: docker.io/openmined/grid-frontend:0.8.2-beta.58
imagePullPolicy: IfNotPresent
resources: {}
tty: true
Expand Down
2 changes: 1 addition & 1 deletion packages/hagrid/hagrid/deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
from .version import __version__

LATEST_STABLE_SYFT = "0.8.1"
LATEST_BETA_SYFT = "0.8.2-beta.56"
LATEST_BETA_SYFT = "0.8.2-beta.58"

DOCKER_ERROR = """
You are running an old version of docker, possibly on Linux. You need to install v2.
Expand Down
6 changes: 3 additions & 3 deletions packages/hagrid/hagrid/manifest_template.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
manifestVersion: 0.1
hagrid_version: 0.3.84
syft_version: 0.8.2-beta.56
dockerTag: 0.8.2-beta.56
syft_version: 0.8.2-beta.58
dockerTag: 0.8.2-beta.58
baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
hash: b67ebd360fb8a0832597ecb61e31ab079b0ab437
hash: 57fa51ee64408904d4058585bca86fa44d7f79f0
target_dir: ~/.hagrid/PySyft/
files:
grid:
Expand Down
2 changes: 1 addition & 1 deletion packages/syft/setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = syft
version = attr: "0.8.2-beta.56"
version = attr: "0.8.2-beta.58"
description = Perform numpy-like analysis on data that remains in someone elses server
author = OpenMined
author_email = [email protected]
Expand Down
2 changes: 1 addition & 1 deletion packages/syft/src/syft/VERSION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mono Repo Global Version
__version__ = "0.8.2-beta.56"
__version__ = "0.8.2-beta.58"
# elsewhere we can call this file: `python VERSION` and simply take the stdout

# stdlib
Expand Down
2 changes: 1 addition & 1 deletion packages/syft/src/syft/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "0.8.2-beta.56"
__version__ = "0.8.2-beta.58"

# stdlib
import pathlib
Expand Down
Loading

0 comments on commit b70e80f

Please sign in to comment.