From a777d5971235c0a8a4cbf420aa2e5988a7a6450c Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Wed, 12 Feb 2025 15:37:50 -0500 Subject: [PATCH 1/2] Switch to registry.odigos.io --- Makefile | 13 +++++++------ kubernetes/deployment.yaml | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index dd7fb2c..643270e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ PROJECT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) VERSION := v0.1 +REGISTRY := "us-central1-docker.pkg.dev/odigos-cloud/components" .PHONY: generate-webapp generate-webapp: @@ -38,11 +39,11 @@ deploy: .PHONY: build-push-images-prod build-push-images-prod: @echo "Building images..." - docker buildx build -t keyval/odigos-demo-frontend:${VERSION} $(PROJECT_DIR)frontend -f $(PROJECT_DIR)frontend/Dockerfile --platform linux/amd64,linux/arm64 --push - docker buildx build -t keyval/odigos-demo-inventory:${VERSION} $(PROJECT_DIR)inventory -f $(PROJECT_DIR)inventory/Dockerfile --platform linux/amd64,linux/arm64 --push - docker buildx build -t keyval/odigos-demo-pricing:${VERSION} $(PROJECT_DIR)pricing -f $(PROJECT_DIR)pricing/Dockerfile --platform linux/amd64,linux/arm64 --push - docker buildx build -t keyval/odigos-demo-coupon:${VERSION} $(PROJECT_DIR)coupon -f $(PROJECT_DIR)coupon/Dockerfile --platform linux/amd64,linux/arm64 --push - docker buildx build -t keyval/odigos-demo-membership:${VERSION} $(PROJECT_DIR)membership -f $(PROJECT_DIR)membership/Dockerfile --platform linux/amd64,linux/arm64 --push + docker buildx build -t ${REGISTRY}/odigos-demo-frontend:${VERSION} $(PROJECT_DIR)frontend -f $(PROJECT_DIR)frontend/Dockerfile --platform linux/amd64,linux/arm64 --push + docker buildx build -t ${REGISTRY}/odigos-demo-inventory:${VERSION} $(PROJECT_DIR)inventory -f $(PROJECT_DIR)inventory/Dockerfile --platform linux/amd64,linux/arm64 --push + docker buildx build -t ${REGISTRY}/odigos-demo-pricing:${VERSION} $(PROJECT_DIR)pricing -f $(PROJECT_DIR)pricing/Dockerfile --platform linux/amd64,linux/arm64 --push + docker buildx build -t ${REGISTRY}/odigos-demo-coupon:${VERSION} $(PROJECT_DIR)coupon -f $(PROJECT_DIR)coupon/Dockerfile --platform linux/amd64,linux/arm64 --push + docker buildx build -t ${REGISTRY}/odigos-demo-membership:${VERSION} $(PROJECT_DIR)membership -f $(PROJECT_DIR)membership/Dockerfile --platform linux/amd64,linux/arm64 --push .PHONY: deploy-membership @@ -83,4 +84,4 @@ deploy-frontend: docker build -t dev/frontend:dev $(PROJECT_DIR)frontend -f $(PROJECT_DIR)frontend/Dockerfile kind load docker-image dev/frontend:dev kubectl apply -f $(PROJECT_DIR)frontend/deployment/ - kubectl rollout restart deployment frontend \ No newline at end of file + kubectl rollout restart deployment frontend diff --git a/kubernetes/deployment.yaml b/kubernetes/deployment.yaml index c8909eb..3ecb0a4 100644 --- a/kubernetes/deployment.yaml +++ b/kubernetes/deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: coupon - image: keyval/odigos-demo-coupon:v0.1.14 + image: registry.odigos.io/odigos-demo-coupon:v0.1.14 imagePullPolicy: Always env: - name: MEMBERSHIP_SERVICE_HOST @@ -52,7 +52,7 @@ spec: spec: containers: - name: frontend - image: keyval/odigos-demo-frontend:v0.1.14 + image: registry.odigos.io/odigos-demo-frontend:v0.1.14 imagePullPolicy: Always env: - name: INVENTORY_SERVICE_HOST @@ -93,7 +93,7 @@ spec: spec: containers: - name: inventory - image: keyval/odigos-demo-inventory:v0.1.14 + image: registry.odigos.io/odigos-demo-inventory:v0.1.14 imagePullPolicy: Always ports: - containerPort: 8080 @@ -127,7 +127,7 @@ spec: spec: containers: - name: membership - image: keyval/odigos-demo-membership:v0.1.14 + image: registry.odigos.io/odigos-demo-membership:v0.1.14 imagePullPolicy: Always ports: - containerPort: 8080 @@ -161,7 +161,7 @@ spec: spec: containers: - name: pricing - image: keyval/odigos-demo-pricing:v0.1.14 + image: registry.odigos.io/odigos-demo-pricing:v0.1.14 imagePullPolicy: Always ports: - containerPort: 8080 From ce7cdb31c6e21cbd579647d40aadf420066d78c2 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 13 Feb 2025 17:20:41 -0500 Subject: [PATCH 2/2] Updates to build --- Makefile | 4 ++-- inventory/Dockerfile | 14 ++++++++------ inventory/README.md | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 643270e..291a39a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PROJECT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) -VERSION := v0.1 -REGISTRY := "us-central1-docker.pkg.dev/odigos-cloud/components" +VERSION := v0.1.14 +REGISTRY := us-central1-docker.pkg.dev/odigos-cloud/components .PHONY: generate-webapp generate-webapp: diff --git a/inventory/Dockerfile b/inventory/Dockerfile index 4134f94..f118097 100644 --- a/inventory/Dockerfile +++ b/inventory/Dockerfile @@ -2,8 +2,8 @@ FROM python:3.11 AS builder # Set environment variables for Python and prevent writing .pyc files -ENV PYTHONDONTWRITEBYTECODE 1 -ENV PYTHONUNBUFFERED 1 +ENV PYTHONDONTWRITEBYTECODE=1 +ENV PYTHONUNBUFFERED=1 # Install system dependencies RUN apt-get update \ @@ -16,21 +16,23 @@ RUN apt-get update \ WORKDIR /app # Copy only the poetry files to the working directory -COPY poetry.lock pyproject.toml inventory/ /app/ +COPY poetry.lock pyproject.toml README.md /app/ + +COPY inventory/ /app/inventory # Install Poetry RUN pip install poetry # Install project dependencies RUN poetry config virtualenvs.create false \ - && poetry install --no-dev + && poetry install # Stage 2: Runtime Stage FROM python:3.11-slim # Set environment variables for Python and prevent writing .pyc files -ENV PYTHONDONTWRITEBYTECODE 1 -ENV PYTHONUNBUFFERED 1 +ENV PYTHONDONTWRITEBYTECODE=1 +ENV PYTHONUNBUFFERED=1 # Create and set the working directory WORKDIR /app diff --git a/inventory/README.md b/inventory/README.md index e69de29..f9a97fa 100644 --- a/inventory/README.md +++ b/inventory/README.md @@ -0,0 +1 @@ +# Inventory