Update ifix install process to match Open Liberty (#469)

kabicin · web-flow · commit 0e7908c72882 · 2023-05-18T15:29:30.000-04:00
* Update latest and 22.0.0.8 with /fixes and /liberty symlink

* Update beta with /fixes and /liberty symlink

* Revert /liberty symlink

* Revert /liberty symlink

* Move symlink changes to 22.0.0.10

* Update ifix symlink for 22.0.0.12

* Update /fixes link for 23.0.0.3

* Move symlink changes to 22.0.0.10
diff --git a/beta/Dockerfile b/beta/Dockerfile
@@ -57,6 +57,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && chown -R 1001:0 /config \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubi.ibmjava8 b/ga/22.0.0.12/kernel/Dockerfile.ubi.ibmjava8
@@ -89,6 +89,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk11 b/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk11
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk17 b/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk17
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk8 b/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk8
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/22.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 b/ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk11
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 b/ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk17
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/23.0.0.4/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.4/kernel/Dockerfile.ubi.ibmjava8
@@ -89,6 +89,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/23.0.0.4/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.4/kernel/Dockerfile.ubi.openjdk11
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/23.0.0.4/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.4/kernel/Dockerfile.ubi.openjdk17
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/23.0.0.4/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.4/kernel/Dockerfile.ubi.openjdk8
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/23.0.0.4/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.4/kernel/Dockerfile.ubuntu.ibmjava8
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/23.0.0.4/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.4/kernel/Dockerfile.ubuntu.openjdk11
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/23.0.0.4/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.4/kernel/Dockerfile.ubuntu.openjdk17
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/applying-ifixes/README.md b/ga/applying-ifixes/README.md
@@ -1,13 +1,13 @@
 # Applying interim fixes
 
-This section describes the process to apply interim fixes (iFix) via the Dockerfile during `build` time, by adding the interim fix JAR files to `/opt/ibm/fixes` directory and calling `RUN configure.sh`. Interim fixes recommended by IBM, such as to resolve security vulnerabilities, are also included in the same directory. 
+This section describes the process to apply interim fixes (iFix) via the Dockerfile during `build` time, by adding the interim fix JAR files to `/fixes` directory and calling `RUN configure.sh`. Interim fixes recommended by IBM, such as to resolve security vulnerabilities, are also included in the same directory. 
 
 Ensure that all features needed by your applications, apart from the ones that will be automatically added for the [enterprise functionalities](https://github.com/WASdev/ci.docker#enterprise-functionality) you selected, are specified prior to calling `RUN configure.sh`, since interim fixes should only be applied once needed features are installed.
 
 ```dockerfile
 # Add interim fixes (optional)
-COPY --chown=1001:0  interim-fixes /opt/ibm/fixes/
+COPY --chown=1001:0  interim-fixes /fixes/
 
 # This script will add the requested XML snippets, grow image to be fit-for-purpose and apply interim fixes
 RUN configure.sh
-```
+```
diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -89,6 +89,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -90,6 +90,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -88,6 +88,7 @@ RUN mkdir /logs \
     && ln -s $WLP_OUTPUT_DIR/defaultServer /output \
     && ln -s /opt/ibm/wlp/usr/servers/defaultServer /config \
     && ln -s /opt/ibm /liberty \
+    && ln -s /opt/ibm/fixes /fixes \
     && ln -s /opt/ibm/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
     && mkdir -p /config/configDropins/defaults \
     && mkdir -p /config/configDropins/overrides \
