some fixs

.devcontainer/Dockerfile

@@ -0,0 +1,20 @@
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && apt-get install -y \
+    python3 \
+    python3-pip \
+    curl \
+    git \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
+RUN curl -1sLf 'https://dl.cloudsmith.io/public/task/task/setup.deb.sh' | sudo -E bash
+RUN apt install task -y
+RUN useradd -m -s /bin/bash vscode && \
+    echo "vscode ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+RUN curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.36.4/pack-v0.36.4-linux.tgz" \
+    | tar -C /usr/local/bin/ --no-same-owner -xzv pack
+
+USER vscode

.devcontainer/devcontainer.json

@@ -0,0 +1,36 @@
+{
+    "name": "CNB java",
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "containerEnv": {
+        "DOCKER_API_VERSION": "1.41"
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+            "version": "latest",
+            "enableNonRootChildContainerUsage": true
+        },
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "configureZshAsDefaultShell": false,
+            "username": "vscode"
+        }
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-kubernetes-tools.vscode-kubernetes-tools",
+                "redhat.vscode-yaml",
+                "ms-azuretools.vscode-docker",
+                "pkief.material-icon-theme",
+                "ms-python.python",
+                "tamasfe.even-better-toml"
+            ],
+            "settings": {
+                "terminal.integrated.defaultProfile.linux": "bash"
+            }
+        }
+    },
+    "remoteUser": "vscode",
+    "postCreateCommand": "sudo chmod 666 /var/run/docker.sock && pip3 install rich && sudo chown vscode:vscode /var/run/docker.sock || true"
+}

2-builder/builder.toml

@@ -1,141 +1,210 @@
-description = "My Custom Wolfi FIPS Builder"
-
+description = "Custom Wolfi FIPS Builder"
 [stack]
-id = "io.buildpacks.stacks.jammy"
-build-image = "taha/wolfi-build-image:latest"
-run-image = "taha/wolfi-run-image:latest"
+  id = "taha/wolfi-build-image" 
+  build-image = "taha/wolfi-build-image:latest"
+  run-image = "taha/wolfi-run-image:latest"
+
 [[targets]]
-os = "linux"
-arch = "amd64"
-
+  os = "linux"
+  arch = "amd64"
 [[targets]]
-os = "linux"
-arch = "arm64"
-
+  os = "linux"
+  arch = "arm64"
 
 [[buildpacks]]
-uri = "../fips-java-shim"
+  uri = "docker://taha/fips-java:1.0.0"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/ca-certificates:latest"
+  uri = "docker://paketobuildpacks/ca-certificates:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/syft:latest"
+  uri = "docker://paketobuildpacks/syft:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/environment-variables:latest"
+  uri = "docker://paketobuildpacks/environment-variables:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/image-labels:latest"
+  uri = "docker://paketobuildpacks/image-labels:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/procfile:latest"
+  uri = "docker://paketobuildpacks/procfile:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/jattach:latest"
+  uri = "docker://paketobuildpacks/jattach:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/java-memory-assistant:latest"
+  uri = "docker://paketobuildpacks/java-memory-assistant:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/datadog:latest"
+  uri = "docker://paketobuildpacks/datadog:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/azure-application-insights:latest"
+  uri = "docker://paketobuildpacks/azure-application-insights:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/google-stackdriver:latest"
+  uri = "docker://paketobuildpacks/google-stackdriver:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/maven:latest"
+  uri = "docker://paketobuildpacks/maven:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/gradle:latest"
+  uri = "docker://paketobuildpacks/gradle:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/sbt:latest"
+  uri = "docker://paketobuildpacks/sbt:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/executable-jar:latest"
+  uri = "docker://paketobuildpacks/executable-jar:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/spring-boot:latest"
+  uri = "docker://paketobuildpacks/spring-boot:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/apache-tomcat:latest"
+  uri = "docker://paketobuildpacks/apache-tomcat:latest"
 
 [[buildpacks]]
-uri = "docker://paketobuildpacks/dist-zip:latest"
+  uri = "docker://paketobuildpacks/dist-zip:latest"
 
 [[order]]
-
   [[order.group]]
     id = "paketo-buildpacks/ca-certificates"
     optional = true
-
   [[order.group]]
     id = "taha/fips-java"
-
   [[order.group]]
     id = "paketo-buildpacks/syft"
     optional = true
-
-  [[order.group]]
-    id = "paketo-buildpacks/gradle"
-    optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/maven"
-    optional = true
-
   [[order.group]]
-    id = "paketo-buildpacks/sbt"
+    id = "paketo-buildpacks/executable-jar"
     optional = true
-
   [[order.group]]
-    id = "paketo-buildpacks/executable-jar"
+    id = "paketo-buildpacks/spring-boot"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/apache-tomcat"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/dist-zip"
     optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/procfile"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/jattach"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/azure-application-insights"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/google-stackdriver"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/datadog"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/java-memory-assistant"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/environment-variables"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/image-labels"
+    optional = true
 
+[[order]]
+  [[order.group]]
+    id = "paketo-buildpacks/ca-certificates"
+    optional = true
+  [[order.group]]
+    id = "taha/fips-java"
+  [[order.group]]
+    id = "paketo-buildpacks/syft"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/gradle"
+  [[order.group]]
+    id = "paketo-buildpacks/executable-jar"
+    optional = true
   [[order.group]]
     id = "paketo-buildpacks/spring-boot"
     optional = true
-
+  [[order.group]]
+    id = "paketo-buildpacks/apache-tomcat"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/dist-zip"
+    optional = true
   [[order.group]]
     id = "paketo-buildpacks/procfile"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/jattach"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/azure-application-insights"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/google-stackdriver"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/datadog"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/java-memory-assistant"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/environment-variables"
     optional = true
-
   [[order.group]]
     id = "paketo-buildpacks/image-labels"
+    optional = true
+
+[[order]]
+  [[order.group]]
+    id = "paketo-buildpacks/ca-certificates"
+    optional = true
+  [[order.group]]
+    id = "taha/fips-java"
+  [[order.group]]
+    id = "paketo-buildpacks/syft"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/sbt"
+  [[order.group]]
+    id = "paketo-buildpacks/executable-jar"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/spring-boot"
+    optional = true
+
+[[order]]
+  [[order.group]]
+    id = "paketo-buildpacks/ca-certificates"
+    optional = true
+  [[order.group]]
+    id = "taha/fips-java"
+  [[order.group]]
+    id = "paketo-buildpacks/syft"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/executable-jar"
+  [[order.group]]
+    id = "paketo-buildpacks/spring-boot"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/jattach"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/java-memory-assistant"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/datadog"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/azure-application-insights"
+    optional = true
+  [[order.group]]
+    id = "paketo-buildpacks/google-stackdriver"
     optional = true

4-gradle-app/src/main/java/com/taha/wolfidemo/DemoApplication.java

@@ -44,7 +44,7 @@ public String testFipsConstraint() {
             // FipsUnapprovedOperationError or specific FIPS messages indicate success
             if (errorType.contains("FipsUnapprovedOperationError") || 
                 (message != null && message.toLowerCase().contains("approved only mode"))) {
-                return "SUCCESS: FIPS is strictly enforced. System blocked insecure RSA-1024 key generation. Error Type: " + errorType;
+                return " just change SUCCESS: FIPS is strictly enforced. System blocked insecure RSA-1024 key generation. Error Type: " + errorType;
             }
 
             return "TERMINATED: An unexpected error occurred: " + errorType + " - " + message;

Taskfile.yml

@@ -0,0 +1,30 @@
+version: '3'
+env:
+  DOCKER_API_VERSION: "1.50"
+  PACK_VOLUME_KEY: "taha-fips-cache-key"
+includes:
+  img: taskfile/image.yml
+  builder: taskfile/builder.yml
+  app: taskfile/app.yml
+  util: taskfile/util.yml
+  bp: taskfile/buildpack.yml
+
+
+vars:
+  BUILD_IMAGE: taha/wolfi-build-image:latest
+  RUN_IMAGE: taha/wolfi-run-image:latest
+  BUILDER_NAME: taha/wolfi-fips-builder:latest
+  BUILDER_CONFIG: 2-builder/builder.toml
+
+tasks:
+  default:
+    cmds:
+      - task: all
+
+  all:
+    desc: Build everything from scratch
+    cmds:
+      - task: img:build-img
+      - task: img:run-img
+      - task: bp:package
+      - task: builder:create