From 6917fa05283ede4bc5e76f5869a50fd169298cfa Mon Sep 17 00:00:00 2001 From: Uj5Ghare Date: Thu, 2 Apr 2026 23:31:19 +0530 Subject: [PATCH 1/2] Remove push triggers from all workflows - only trigger on pull requests --- .github/workflows/cart.yaml | 6 ------ .github/workflows/catalogue.yaml | 6 ------ .github/workflows/dispatch.yaml | 6 ------ .github/workflows/mongo.yaml | 6 ------ .github/workflows/mysql.yaml | 6 ------ .github/workflows/payment.yaml | 6 ------ .github/workflows/ratings.yaml | 6 ------ .github/workflows/shipping.yaml | 6 ------ .github/workflows/user.yaml | 6 ------ .github/workflows/web.yaml | 6 ------ 10 files changed, 60 deletions(-) diff --git a/.github/workflows/cart.yaml b/.github/workflows/cart.yaml index 7eabdde..ef55163 100644 --- a/.github/workflows/cart.yaml +++ b/.github/workflows/cart.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "cart/**" - - ".github/workflows/cart.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/catalogue.yaml b/.github/workflows/catalogue.yaml index a0c5df6..77b5011 100644 --- a/.github/workflows/catalogue.yaml +++ b/.github/workflows/catalogue.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "catalogue/**" - - ".github/workflows/catalogue.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/dispatch.yaml b/.github/workflows/dispatch.yaml index b54be28..d2bca7a 100644 --- a/.github/workflows/dispatch.yaml +++ b/.github/workflows/dispatch.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "dispatch/**" - - ".github/workflows/dispatch.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/mongo.yaml b/.github/workflows/mongo.yaml index b50f4fc..9af4267 100644 --- a/.github/workflows/mongo.yaml +++ b/.github/workflows/mongo.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "mongo/**" - - ".github/workflows/mongo.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/mysql.yaml b/.github/workflows/mysql.yaml index 17e9517..14d8a39 100644 --- a/.github/workflows/mysql.yaml +++ b/.github/workflows/mysql.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "mysql/**" - - ".github/workflows/mysql.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/payment.yaml b/.github/workflows/payment.yaml index f0b0145..f3fb939 100644 --- a/.github/workflows/payment.yaml +++ b/.github/workflows/payment.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "payment/**" - - ".github/workflows/payment.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/ratings.yaml b/.github/workflows/ratings.yaml index 11d7dbc..23aa32c 100644 --- a/.github/workflows/ratings.yaml +++ b/.github/workflows/ratings.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "ratings/**" - - ".github/workflows/ratings.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/shipping.yaml b/.github/workflows/shipping.yaml index a868535..d600eb3 100644 --- a/.github/workflows/shipping.yaml +++ b/.github/workflows/shipping.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "shipping/**" - - ".github/workflows/shipping.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/user.yaml b/.github/workflows/user.yaml index be38dcf..27c24b3 100644 --- a/.github/workflows/user.yaml +++ b/.github/workflows/user.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "user/**" - - ".github/workflows/user.yaml" pull_request: branches: - env/prod diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml index f48e1d6..73692f2 100644 --- a/.github/workflows/web.yaml +++ b/.github/workflows/web.yaml @@ -5,12 +5,6 @@ name: Shopstack DevSecOps Pipeline on: - push: - branches: - - env/prod - paths: - - "web/**" - - ".github/workflows/web.yaml" pull_request: branches: - env/prod From 50c4b8a62c8a114228f19ab632ede2a0fc9e68ec Mon Sep 17 00:00:00 2001 From: Uj5Ghare Date: Fri, 3 Apr 2026 00:25:52 +0530 Subject: [PATCH 2/2] Optimize Dockerfiles with specific package versions and cleaner structure --- payment/Dockerfile | 8 ++++---- ratings/Dockerfile | 15 ++++++++------- shipping/Dockerfile | 28 ++++------------------------ 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/payment/Dockerfile b/payment/Dockerfile index 1a09b30..20c56be 100644 --- a/payment/Dockerfile +++ b/payment/Dockerfile @@ -3,7 +3,9 @@ FROM python:3.9-alpine AS builder WORKDIR /app -RUN apk add --no-cache build-base linux-headers +RUN apk add --no-cache \ + build-base=0.5-r3 \ + linux-headers=6.14.2-r0 COPY requirements.txt . @@ -22,6 +24,4 @@ COPY payment.ini /app/ EXPOSE 8080 -CMD ["uwsgi", "--ini", "payment.ini"] - - +CMD ["uwsgi", "--ini", "payment.ini"] \ No newline at end of file diff --git a/ratings/Dockerfile b/ratings/Dockerfile index f16ad9a..f9bcc92 100644 --- a/ratings/Dockerfile +++ b/ratings/Dockerfile @@ -1,17 +1,19 @@ -# -# Build the app -# +## Composer stage +FROM composer:2.7 AS composer + +## Build the app FROM php:7.4-apache-bullseye RUN apt-get update && apt-get install -yqq --no-install-recommends \ - unzip libzip-dev \ + unzip=6.0-26+deb11u1 \ + libzip-dev=1.7.3-1 \ && docker-php-ext-install pdo_mysql opcache zip \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Enable AutoProfile for PHP which is currently opt-in beta RUN echo "instana.enable_auto_profile=1" > "/usr/local/etc/php/conf.d/zzz-instana-extras.ini" -# relax permissions on status +# Relax permissions on status COPY status.conf /etc/apache2/mods-available/status.conf # Enable Apache mod_rewrite and status RUN a2enmod rewrite && a2enmod status @@ -29,5 +31,4 @@ RUN composer install --no-dev --optimize-autoloader # safe for this simple demo. RUN rm -Rf /var/www/var/* \ && chown -R www-data /var/www \ - && chmod -R 777 /var/www - + && chmod -R 777 /var/www \ No newline at end of file diff --git a/shipping/Dockerfile b/shipping/Dockerfile index 6ac2f09..f6b5224 100644 --- a/shipping/Dockerfile +++ b/shipping/Dockerfile @@ -1,36 +1,16 @@ -# -# Build -# -FROM debian:12 AS build - -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - ca-certificates-java \ - maven && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - update-ca-certificates -f - +## Build +FROM maven:3.9.14-amazoncorretto-8-debian AS build WORKDIR /opt/shipping - COPY pom.xml /opt/shipping/ RUN mvn dependency:resolve COPY src /opt/shipping/src/ RUN mvn package -# -# Run -# +## Run FROM amazoncorretto:8 - EXPOSE 8080 - WORKDIR /opt/shipping - ENV CART_ENDPOINT=cart:8080 ENV DB_HOST=mysql - COPY --from=build /opt/shipping/target/shipping-1.0.jar shipping.jar - -CMD [ "java", "-Xmn256m", "-Xmx768m", "-jar", "shipping.jar" ] - +CMD [ "java", "-Xmn256m", "-Xmx768m", "-jar", "shipping.jar" ] \ No newline at end of file