Refactor workflows to trigger on PRs and optimize Dockerfiles

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

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"]

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

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" ]