fix(docker): utilize docker cache faster for epic wins

chore: make naming convention more consistent

Dockerfile

@@ -1,16 +1,16 @@
 FROM maven:3.9-eclipse-temurin-17 AS build
 
-RUN mkdir -p /usr/src/zfgbb
-ADD . /usr/src/zfgbb
-
-WORKDIR /usr/src/zfgbb
+WORKDIR /usr/src
+ADD ./mvn* ./
+ADD ./pom.xml ./
+ADD ./src ./src
 
 RUN mvn clean compile package -Dmaven.test.skip=true
 
 # FIXME: This image should be switched to gcr.io/distroless/java-base-debian12 because it is much smaller. For now, this will work.
 FROM tomcat:jre17-temurin-jammy AS deploy
 
-COPY --from=build /usr/src/zfgbb/target/*.war /usr/local/tomcat/webapps/
+COPY --from=build /usr/src/target/*.war /usr/local/tomcat/webapps/
 
 EXPOSE ${ZFGBB_BACKEND_PORT:-8080}
 

docker-compose.yml

@@ -1,3 +1,4 @@
+name: zfgbb
 services:
   postgresql:
     container_name: zfgbb_postgresql
@@ -20,8 +21,8 @@ services:
       start_period: 80s  
 
   zfgbb:
-    container_name: zfgbb
-    hostname: zfgbb
+    container_name: zfgbb_api
+    hostname: zfgbb_api
     build:
       context: .
       dockerfile: Dockerfile

iac/zfgc.com/.env.example

@@ -1,7 +1,7 @@
 MYSQL_DIRECTORY=./dist/old-skool/mysql_data
-POSTGRES_DIRECTORY=./dist/zfg-bb/postgres_data
+POSTGRES_DIRECTORY=./dist/zfgbb/postgres_data
 APACHE_VHOST_CONFIG_DIRECTORY=./dist/old-skool/apache_vhosts
 MYSQL_PASSWORD=your_mysql_password
 POSTGRES_PASSWORD=your_postgres_password
 APACHE_VHOST_CONFIG_DIRECTORY=./dist/old-skool/apache_vhosts
-ZFGBB_IMAGE_NAME=zfg-bb:latest
+ZFGBB_IMAGE_NAME=zfgbb-zfgbb:latest

iac/zfgc.com/base/ingress.yml

@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: my-ingress
-#  namespace: zfg-bb
+#  namespace: zfgbb
 spec:
   rules:
   - host: zfgc.com
@@ -32,6 +32,6 @@ spec:
         pathType: ImplementationSpecific
         backend:
           service:
-            name: zfg-bb
+            name: zfgbb
             port:
               number: 80

iac/zfgc.com/base/kustomization.yml

@@ -1,4 +1,4 @@
-namespace: zfg-bb
+namespace: zfgbb
 resources:
   #- namespace.yml
   - ingress.yml
@@ -14,20 +14,20 @@ resources:
 #   literals:
 #     - mysqlPassword=default-mysql-password
 
-# - name: zfg-bb-secret
+# - name: zfgbb-secret
 #   literals:
 #     - postgresPassword=default-postgres-password
 
 configMapGenerator:
   - name: old-skool-config
     #env: .env
-  - name: zfg-bb-config
+  - name: zfgbb-config
     #env: .env
 
 secretGenerator:
   - name: old-skool-secrets
     #env: .env  # Reference to the environment file
     type: Opaque
-  - name: zfg-bb-secrets
+  - name: zfgbb-secrets
     #env: .env  # Reference to the environment file
     type: Opaque

iac/zfgc.com/base/namespace.yml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: zfg-bb
+  name: zfgbb

iac/zfgc.com/environments/development/kustomization.yml

@@ -1,8 +1,8 @@
-namespace: zfg-bb-develop
+namespace: zfgbb-develop
 resources:
 - namespace.yml
 - ../../base
-- ../../services/zfg-bb
+- ../../services/zfgbb
 
 configMapGenerator:
 - behavior: merge
@@ -12,7 +12,7 @@ configMapGenerator:
 - behavior: merge
   envs:
   - .env
-  name: zfg-bb-config
+  name: zfgbb-config
 
 secretGenerator:
 - behavior: merge
@@ -23,7 +23,7 @@ secretGenerator:
 - behavior: merge
   envs:
   - .env
-  name: zfg-bb-secrets
+  name: zfgbb-secrets
   type: Opaque
 
 # replacements:
@@ -35,17 +35,17 @@ secretGenerator:
 #   - fieldPaths:
 #     - metadata.namespace
 #     select:
-#       name: zfg-bb
+#       name: zfgbb
 # - source:
 #     fieldPath: data.NAMESPACE
 #     kind: ConfigMap
-#     name: zfg-bb-config
+#     name: zfgbb-config
 #   targets:
 #   - fieldPaths:
 #     - metadata.name
 #     select:
 #       kind: Namespace
-#      # name: zfg-bb
+#      # name: zfgbb
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization

iac/zfgc.com/environments/development/namespace.yml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: zfg-bb-develop
+  name: zfgbb-develop

iac/zfgc.com/scripts/development/setup-dev-environment.sh

@@ -32,7 +32,7 @@ mkdir -p "$DIST_DIR"
 
 # Define the directories for services under dist
 OLD_SKOOL_DIR="$DIST_DIR/old-skool"
-ZFG_BB_DIR="$DIST_DIR/zfg-bb"
+ZFG_BB_DIR="$DIST_DIR/zfgbb"
 MYSQL_DIR="$OLD_SKOOL_DIR/mysql_data"
 POSTGRES_DIR="$ZFG_BB_DIR/postgres_data"
 APACHE_VHOSTS_DIR="$OLD_SKOOL_DIR/apache_vhosts"
@@ -62,7 +62,7 @@ MYSQL_DIRECTORY=$MYSQL_DIR
 POSTGRES_DIRECTORY=$POSTGRES_DIR
 APACHE_VHOST_CONFIG_DIRECTORY=$APACHE_VHOSTS_DIR
 
-ZFGBB_IMAGE_NAME=zfg-bb:latest
+ZFGBB_IMAGE_NAME=zfgbb:latest
 MYSQL_PASSWORD=$MYSQL_PASSWORD
 POSTGRES_PASSWORD=$POSTGRES_PASSWORD
 EOL
@@ -78,7 +78,7 @@ MYSQL_PASSWORD=$(openssl rand -base64 32)
 MYSQL_PASSWORD=$(kubectl create secret generic old-skool-secrets --from-literal=MYSQL_PASSWORD=${MYSQL_PASSWORD} --dry-run=client -o yaml | awk '/MYSQL_PASSWORD:/ {print $2}')
 echo "Creating PostgreSQL secret..."
 POSTGRES_PASSWORD=$(openssl rand -base64 32)
-POSTGRES_PASSWORD=$(kubectl create secret generic zfg-bb-secrets --from-literal=POSTGRES_PASSWORD=${POSTGRES_PASSWORD} --dry-run=client -o yaml | awk '/POSTGRES_PASSWORD:/ {print $2}')
+POSTGRES_PASSWORD=$(kubectl create secret generic zfgbb-secrets --from-literal=POSTGRES_PASSWORD=${POSTGRES_PASSWORD} --dry-run=client -o yaml | awk '/POSTGRES_PASSWORD:/ {print $2}')
 if [ -f "$ENV_FILE" ]; then
     rm "$ENV_FILE"
 fi

iac/zfgc.com/services/zfg-bb/deployment-postgres.yml → iac/zfgc.com/services/zfgbb/deployment-postgres.yml

@@ -20,7 +20,7 @@ spec:
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: zfg-bb-secrets
+              name: zfgbb-secrets
               key: POSTGRES_PASSWORD
         ports:
         - containerPort: 5432
@@ -30,4 +30,4 @@ spec:
       volumes:
       - name: postgres-vol
         hostPath:
-          path: ./dist/zfg-bb/postgres_data
+          path: ./dist/zfgbb/postgres_data

iac/zfgc.com/services/zfg-bb/deployment-zfg-bb.yml → iac/zfgc.com/services/zfgbb/deployment-zfgbb.yml

@@ -1,17 +1,16 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: zfg-bb
-  #namespace: ${NAMESPACE}
+  name: zfgbb
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: zfg-bb
+      app: zfgbb
   template:
     metadata:
       labels:
-        app: zfg-bb
+        app: zfgbb
     spec:
       containers:
         - name: tomcat
@@ -20,9 +19,9 @@ spec:
           - name: POSTGRES_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: zfg-bb-secrets
+                name: zfgbb-secrets
                 key: POSTGRES_PASSWORD
-        - name: zfg-bb
-          image: zfg-bb:latest
+        - name: zfgbb
+          image: zfgbb-zfgbb:latest
           ports:
             - containerPort: 8080

iac/zfgc.com/services/zfgbb/kustomization.yml

@@ -0,0 +1,5 @@
+namespace: zfgbb
+resources:
+  - deployment-postgres.yml
+  - deployment-zfgbb.yml
+  - service-postgres.yml