diff --git a/.woodpecker.yml b/.woodpecker.yml index ab25d74f..1e520ce5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -3,7 +3,7 @@ steps: # PR VALIDATION: Parallel type checks (PRs only) # =========================================== typecheck-backend: - image: 10.100.9.70:5000/node:22 + image: node:22 commands: - cd backend - npm ci --prefer-offline @@ -13,7 +13,7 @@ steps: event: pull_request typecheck-cannaiq: - image: 10.100.9.70:5000/node:22 + image: node:22 commands: - cd cannaiq - npm ci --prefer-offline @@ -23,7 +23,7 @@ steps: event: pull_request typecheck-findadispo: - image: 10.100.9.70:5000/node:22 + image: node:22 commands: - cd findadispo/frontend - npm ci --prefer-offline @@ -33,7 +33,7 @@ steps: event: pull_request typecheck-findagram: - image: 10.100.9.70:5000/node:22 + image: node:22 commands: - cd findagram/frontend - npm ci --prefer-offline @@ -46,7 +46,7 @@ steps: # AUTO-MERGE: Merge PR after all checks pass # =========================================== auto-merge: - image: 10.100.9.70:5000/alpine:latest + image: alpine:latest environment: GITEA_TOKEN: from_secret: gitea_token @@ -88,6 +88,7 @@ steps: --build-arg=APP_GIT_SHA=${CI_COMMIT_SHA} --build-arg=APP_BUILD_TIME=${CI_PIPELINE_CREATED} --build-arg=CONTAINER_IMAGE_TAG=sha-${CI_COMMIT_SHA:0:8} + --registry-mirror=mirror.gcr.io --cache=true depends_on: [] when: @@ -108,6 +109,7 @@ steps: --dockerfile=/woodpecker/src/git.spdy.io/Creationshop/cannaiq/cannaiq/Dockerfile --destination=git.spdy.io/creationshop/cannaiq-frontend:latest --destination=git.spdy.io/creationshop/cannaiq-frontend:sha-${CI_COMMIT_SHA:0:8} + --registry-mirror=mirror.gcr.io --cache=true depends_on: [] when: @@ -128,6 +130,7 @@ steps: --dockerfile=/woodpecker/src/git.spdy.io/Creationshop/cannaiq/findadispo/frontend/Dockerfile --destination=git.spdy.io/creationshop/findadispo-frontend:latest --destination=git.spdy.io/creationshop/findadispo-frontend:sha-${CI_COMMIT_SHA:0:8} + --registry-mirror=mirror.gcr.io --cache=true depends_on: [] when: @@ -148,6 +151,7 @@ steps: --dockerfile=/woodpecker/src/git.spdy.io/Creationshop/cannaiq/findagram/frontend/Dockerfile --destination=git.spdy.io/creationshop/findagram-frontend:latest --destination=git.spdy.io/creationshop/findagram-frontend:sha-${CI_COMMIT_SHA:0:8} + --registry-mirror=mirror.gcr.io --cache=true depends_on: [] when: @@ -158,7 +162,7 @@ steps: # STAGE 3: Deploy and Run Migrations # =========================================== deploy: - image: 10.100.9.70:5000/bitnami/kubectl:latest + image: bitnami/kubectl:latest environment: KUBECONFIG_CONTENT: from_secret: kubeconfig_data diff --git a/backend/Dockerfile b/backend/Dockerfile index 8474d5eb..dc6ab7cd 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,6 +1,6 @@ # Build stage # Image: git.spdy.io/creationshop/dispensary-scraper -FROM 10.100.9.70:5000/node:22-slim AS builder +FROM node:22-slim AS builder # Install build tools for native modules (bcrypt, sharp) RUN apt-get update && apt-get install -y \ @@ -27,7 +27,7 @@ RUN npm run build RUN npm prune --production # Production stage -FROM 10.100.9.70:5000/node:22-slim +FROM node:22-slim # Build arguments for version info ARG APP_BUILD_VERSION=dev diff --git a/cannaiq/Dockerfile b/cannaiq/Dockerfile index 858bfd82..04877ddf 100644 --- a/cannaiq/Dockerfile +++ b/cannaiq/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM 10.100.9.70:5000/node:22-slim AS builder +FROM node:22-slim AS builder WORKDIR /app @@ -20,7 +20,7 @@ COPY . . RUN npm run build # Production stage -FROM 10.100.9.70:5000/nginx:alpine +FROM nginx:alpine # Copy built assets from builder stage COPY --from=builder /app/dist /usr/share/nginx/html diff --git a/findadispo/frontend/Dockerfile b/findadispo/frontend/Dockerfile index 7d706273..2c621e41 100644 --- a/findadispo/frontend/Dockerfile +++ b/findadispo/frontend/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM 10.100.9.70:5000/node:22-slim AS builder +FROM node:22-slim AS builder WORKDIR /app @@ -20,7 +20,7 @@ COPY . . RUN npm run build # Production stage -FROM 10.100.9.70:5000/nginx:alpine +FROM nginx:alpine # Copy built assets from builder stage (CRA outputs to /build) COPY --from=builder /app/build /usr/share/nginx/html diff --git a/findagram/frontend/Dockerfile b/findagram/frontend/Dockerfile index 281f90b8..5d9451c3 100644 --- a/findagram/frontend/Dockerfile +++ b/findagram/frontend/Dockerfile @@ -1,5 +1,5 @@ # Build stage -FROM 10.100.9.70:5000/node:22-slim AS builder +FROM node:22-slim AS builder WORKDIR /app @@ -25,7 +25,7 @@ COPY . . RUN npm run build # Production stage -FROM 10.100.9.70:5000/nginx:alpine +FROM nginx:alpine # Copy built assets from builder stage (CRA outputs to /build) COPY --from=builder /app/build /usr/share/nginx/html