Skip to content

Commit

Permalink
Merge pull request #8242 from OpenMined/rasswanth/improve-docker-caching
Browse files Browse the repository at this point in the history
[WIP] Improve Docker Caching
  • Loading branch information
rasswanth-s authored Nov 11, 2023
2 parents 6271601 + 650634d commit 96fa7f9
Show file tree
Hide file tree
Showing 18 changed files with 79 additions and 47 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.53
current_version = 0.8.2-beta.55
tag = False
tag_name = {new_version}
commit = True
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cd-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ jobs:
platforms: ${{ steps.release_metadata.outputs.release_platform }}
tags: ${{ steps.meta_grid_backend.outputs.tags }}
target: backend
cache-from: type=registry,ref=${{ steps.meta_grid_backend.outputs.tags }}
cache-to: type=inline
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Docker meta for Grid-Frontend
id: meta_grid_frontend
Expand All @@ -149,8 +149,8 @@ jobs:
platforms: ${{ steps.release_metadata.outputs.release_platform }}
tags: ${{ steps.meta_grid_frontend.outputs.tags }}
target: grid-ui-development
cache-from: type=registry,ref= ${{ steps.meta_grid_frontend.outputs.tags }}
cache-to: type=inline
cache-from: type=gha
cache-to: type=gha,mode=max

- name: Docker meta for Grid-Enclave
id: meta_grid_enclave
Expand All @@ -170,8 +170,8 @@ jobs:
platforms: ${{ steps.release_metadata.outputs.release_platform }}
tags: ${{ steps.meta_grid_enclave.outputs.tags }}
target: worker
cache-from: type=registry,ref=${{ steps.meta_grid_enclave.outputs.tags }}
cache-to: type=inline
cache-from: type=gha
cache-to: type=gha,mode=max

deploy-syft:
needs:
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.53"
__version__ = "0.8.2-beta.55"
# 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.53"
__version__ = "0.8.2-beta.55"
# 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.53 -t dev-latest
build_images --all -t $(git rev-parse --short=6 HEAD) -t 0.8.2-beta.55 -t dev-latest
create_deployments --all
vars:
DEVSPACE_ENV_FILE: "default.env"
CONTAINER_REGISTRY: "docker.io"
VERSION: "0.8.2-beta.53"
VERSION: "0.8.2-beta.55"

# 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.53",
"version": "0.8.2-beta.55",
"private": true,
"scripts": {
"dev": "pnpm i && vite dev --host --port 80",
Expand Down
70 changes: 51 additions & 19 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.55
created: "2023-11-11T07:42:20.118319829Z"
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: 5fc95afb6ebd029694d8b7d9e4270c2f6458d13e74a3e0ef27b39564dfe377e5
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.55.tgz
version: 0.8.2-beta.55
- apiVersion: v2
appVersion: 0.8.2-beta.54
created: "2023-11-11T07:42:20.116881305Z"
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: 58b872dbf50a04f7a2896561d7cbf148318e0ac0aeee336b799d16f26a5c9862
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.54.tgz
version: 0.8.2-beta.54
- apiVersion: v2
appVersion: 0.8.2-beta.53
created: "2023-11-10T09:11:28.681251984Z"
created: "2023-11-11T07:42:20.114956273Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -19,7 +51,7 @@ entries:
version: 0.8.2-beta.53
- apiVersion: v2
appVersion: 0.8.2-beta.52
created: "2023-11-10T09:11:28.680562759Z"
created: "2023-11-11T07:42:20.113410547Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -35,7 +67,7 @@ entries:
version: 0.8.2-beta.52
- apiVersion: v2
appVersion: 0.8.2-beta.51
created: "2023-11-10T09:11:28.679693389Z"
created: "2023-11-11T07:42:20.112133126Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -51,7 +83,7 @@ entries:
version: 0.8.2-beta.51
- apiVersion: v2
appVersion: 0.8.2-beta.50
created: "2023-11-10T09:11:28.678811685Z"
created: "2023-11-11T07:42:20.110809103Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -67,7 +99,7 @@ entries:
version: 0.8.2-beta.50
- apiVersion: v2
appVersion: 0.8.2-beta.49
created: "2023-11-10T09:11:28.677638509Z"
created: "2023-11-11T07:42:20.109521582Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -83,7 +115,7 @@ entries:
version: 0.8.2-beta.49
- apiVersion: v2
appVersion: 0.8.2-beta.48
created: "2023-11-10T09:11:28.676642062Z"
created: "2023-11-11T07:42:20.108166359Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -99,7 +131,7 @@ entries:
version: 0.8.2-beta.48
- apiVersion: v2
appVersion: 0.8.2-beta.47
created: "2023-11-10T09:11:28.675567509Z"
created: "2023-11-11T07:42:20.106790937Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -115,7 +147,7 @@ entries:
version: 0.8.2-beta.47
- apiVersion: v2
appVersion: 0.8.2-beta.46
created: "2023-11-10T09:11:28.674217864Z"
created: "2023-11-11T07:42:20.104912705Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -131,7 +163,7 @@ entries:
version: 0.8.2-beta.46
- apiVersion: v2
appVersion: 0.8.2-beta.45
created: "2023-11-10T09:11:28.673444713Z"
created: "2023-11-11T07:42:20.103338879Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -147,7 +179,7 @@ entries:
version: 0.8.2-beta.45
- apiVersion: v2
appVersion: 0.8.2-beta.44
created: "2023-11-10T09:11:28.672692251Z"
created: "2023-11-11T07:42:20.10218136Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -163,7 +195,7 @@ entries:
version: 0.8.2-beta.44
- apiVersion: v2
appVersion: 0.8.2-beta.43
created: "2023-11-10T09:11:28.671668613Z"
created: "2023-11-11T07:42:20.100771636Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -179,7 +211,7 @@ entries:
version: 0.8.2-beta.43
- apiVersion: v2
appVersion: 0.8.2-beta.42
created: "2023-11-10T09:11:28.670729132Z"
created: "2023-11-11T07:42:20.099416414Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -195,7 +227,7 @@ entries:
version: 0.8.2-beta.42
- apiVersion: v2
appVersion: 0.8.2-beta.41
created: "2023-11-10T09:11:28.669636445Z"
created: "2023-11-11T07:42:20.098275095Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -211,7 +243,7 @@ entries:
version: 0.8.2-beta.41
- apiVersion: v2
appVersion: 0.8.2-beta.40
created: "2023-11-10T09:11:28.666195322Z"
created: "2023-11-11T07:42:20.097160576Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -227,7 +259,7 @@ entries:
version: 0.8.2-beta.40
- apiVersion: v2
appVersion: 0.8.2-beta.39
created: "2023-11-10T09:11:28.665167687Z"
created: "2023-11-11T07:42:20.095950456Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -243,7 +275,7 @@ entries:
version: 0.8.2-beta.39
- apiVersion: v2
appVersion: 0.8.2-beta.38
created: "2023-11-10T09:11:28.664288839Z"
created: "2023-11-11T07:42:20.094429431Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -259,7 +291,7 @@ entries:
version: 0.8.2-beta.38
- apiVersion: v2
appVersion: 0.8.2-beta.37
created: "2023-11-10T09:11:28.663364496Z"
created: "2023-11-11T07:42:20.093403414Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -275,7 +307,7 @@ entries:
version: 0.8.2-beta.37
- apiVersion: v2
appVersion: 0.8.1
created: "2023-11-10T09:11:28.661682081Z"
created: "2023-11-11T07:42:20.092200794Z"
dependencies:
- name: component-chart
repository: https://charts.devspace.sh
Expand All @@ -289,4 +321,4 @@ entries:
urls:
- https://openmined.github.io/PySyft/helm/syft-0.8.1.tgz
version: 0.8.1
generated: "2023-11-10T09:11:28.66054975Z"
generated: "2023-11-11T07:42:20.090704969Z"
Binary file added packages/grid/helm/repo/syft-0.8.2-beta.54.tgz
Binary file not shown.
Binary file added packages/grid/helm/repo/syft-0.8.2-beta.55.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.53"
appVersion: "0.8.2-beta.53"
version: "0.8.2-beta.55"
appVersion: "0.8.2-beta.55"
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.53
VERSION: 0.8.2-beta.55
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.53
image: docker.io/openmined/grid-backend:0.8.2-beta.55
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.53
image: docker.io/openmined/grid-frontend:0.8.2-beta.55
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.53"
LATEST_BETA_SYFT = "0.8.2-beta.55"

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.53
dockerTag: 0.8.2-beta.53
syft_version: 0.8.2-beta.55
dockerTag: 0.8.2-beta.55
baseUrl: https://raw.githubusercontent.com/OpenMined/PySyft/
hash: f660bb24f0d76f38a8f5c1fba3af8011b02fbb6d
hash: 4490cd92f5616ec7bce779040bb01cf83751526b
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.53"
version = attr: "0.8.2-beta.55"
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.53"
__version__ = "0.8.2-beta.55"
# 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.53"
__version__ = "0.8.2-beta.55"

# stdlib
import pathlib
Expand Down
8 changes: 4 additions & 4 deletions packages/syftcli/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
manifestVersion: 1.0

syftVersion: 0.8.2-beta.53
dockerTag: 0.8.2-beta.53
syftVersion: 0.8.2-beta.55
dockerTag: 0.8.2-beta.55

images:
- docker.io/openmined/grid-frontend:0.8.2-beta.53
- docker.io/openmined/grid-backend:0.8.2-beta.53
- docker.io/openmined/grid-frontend:0.8.2-beta.55
- docker.io/openmined/grid-backend:0.8.2-beta.55
- docker.io/library/mongo:latest
- docker.io/traefik:v2.10

Expand Down

0 comments on commit 96fa7f9

Please sign in to comment.