From f26ca77ed1aebfa3dd881a03db430bc38c173da2 Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Fri, 15 May 2026 17:59:35 +0300 Subject: [PATCH] Update ipify to use base images from harbor --- .woodpecker.yaml | 10 +++++----- backend/Dockerfile | 2 +- frontend/Dockerfile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.woodpecker.yaml b/.woodpecker.yaml index 3d68271..b7caf03 100644 --- a/.woodpecker.yaml +++ b/.woodpecker.yaml @@ -1,7 +1,7 @@ steps: build-frontend: name: Build & Push Frontend - image: woodpeckerci/plugin-kaniko + image: harbor.dvirlabs.com/base-images/plugin-kaniko when: branch: [ master, develop ] event: [ push, pull_request, tag ] @@ -22,14 +22,14 @@ steps: build-backend: name: Build & Push Backend - image: woodpeckerci/plugin-kaniko + image: harbor.dvirlabs.com/base-images/plugin-kaniko when: branch: [ master, develop ] event: [ push, pull_request, tag ] path: include: [ backend/** ] settings: - registry: harbor-core.dev-tools.svc.cluster.local + registry: harbor.dvirlabs.com repo: my-apps/${CI_REPO_NAME}-backend dockerfile: backend/Dockerfile context: backend @@ -43,7 +43,7 @@ steps: update-values-frontend: name: Update frontend tag in values.yaml - image: alpine:3.19 + image: harbor.dvirlabs.com/base-images/alpine-git-yq:3.19 when: branch: [ master, develop ] event: [ push ] @@ -70,7 +70,7 @@ steps: update-values-backend: name: Update backend tag in values.yaml - image: alpine:3.19 + image: harbor.dvirlabs.com/base-images/alpine-git-yq:3.19 when: branch: [ master, develop ] event: [ push ] diff --git a/backend/Dockerfile b/backend/Dockerfile index 61fb5b6..c306081 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -13,4 +13,4 @@ COPY main.py . EXPOSE 8000 # Run the application -CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file +CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] diff --git a/frontend/Dockerfile b/frontend/Dockerfile index bad3d1a..eac890c 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM node:18-alpine as build +FROM harbor.dvirlabs.com/base-images/node:18-alpine as build WORKDIR /app @@ -16,7 +16,7 @@ COPY . . RUN npm run build # Production stage -FROM nginx:alpine +FROM harbor.dvirlabs.com/base-images/nginx:alpine # Copy built files from build stage COPY --from=build /app/dist /usr/share/nginx/html @@ -32,4 +32,4 @@ RUN echo '#!/bin/sh' > /docker-entrypoint.d/40-generate-env.sh && \ # Expose port EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +CMD ["nginx", "-g", "daemon off;"]