Merge pull request #167 from mezarin/correctGradleOLCacheCopy

Copy wlp cache to correct directory

templates/devfiles/gradle/devfile.yaml

@@ -88,4 +88,4 @@ commands:
  hotReloadCapable: true
  group:
  kind: test
- isDefault: true
+ isDefault: true

templates/devfiles/maven/devfile.yaml

@@ -52,7 +52,7 @@ commands:
  workingDir: /projects
  hotReloadCapable: true
  group:
- kind: build 
+ kind: build
  isDefault: true
  - id: run
  exec:
@@ -82,7 +82,7 @@ commands:
  kind: debug
  isDefault: true
  - id: test
- # The 'test' command requires an already active container. Multi-module apps require compilation is needed prior to processing the tests.
+ # The 'test' command requires an already active container. Multi-module apps require compilation prior to test processing.
  exec:
  component: dev
  commandLine: mvn compiler:compile failsafe:integration-test failsafe:verify

templates/stackimage/gradle/Dockerfile

@@ -70,9 +70,9 @@ ENV OPENJ9_JAVA_OPTIONS="-Xshareclasses:name=liberty,nonfatal,cacheDir=/output/.
 RUN mkdir -p /output \
  && chown -R java_user /output \
  && chmod 775 /output \
- && mkdir -p /opt/ol \
+ && mkdir -p /opt/ol/wlp \
  && chown -R java_user /opt/ol \
- && chmod 775 /opt/ol /opt/ol \
+ && chmod -R 775 /opt/ol \
  && mkdir -p /work/outer-loop-app \
  && chown -R java_user /work \
  && chmod -R 775 /work \
@@ -91,7 +91,7 @@ COPY --chown=1001:0 --from=builder /stacks/java-openliberty/config/configDropins
 COPY --chown=1001:0 --from=builder /stacks/java-openliberty/scripts /stack/ol/scripts
 RUN chmod -R 755 /stack/ol/scripts
 
-COPY --chown=1001:0 --from=builder /stacks/java-openliberty/priming-app/build/wlp /opt/ol
+COPY --chown=1001:0 --from=builder /stacks/java-openliberty/priming-app/build/wlp /opt/ol/wlp
 COPY --chown=1001:0 ./LICENSE /licenses/
 
 USER java_user