Skip to content

Commit ac909fa

Browse files
committed
πŸ“ Adjusted the README files for AEM 6.5 LTS SP1
Added instruction to alter the CMD line because, for LTS, Adobe changes the .jar file name with each new SP. I would like to figure out a way to not require this, but for now, this is a workable workaround.
1 parent 9d2244a commit ac909fa

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

β€Žrest-services/it.tests/README.mdβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ The TestContainers code assumes that the image contains an AEM instance running
4040

4141
#### Creating a Containerized Image using `aem_cntrl`
4242

43-
In order to create a containerized image...
43+
In order to create a containerized AEM integration test image...
4444
* Create the FluentForms jar files (`fluentforms.core-0.0.x-SNAPSHOT.jar`, and `rest-services.server-0.0.x-SNAPSHOT.jar`) from their projects within this GitHub repo.
4545
* Download the latest AEM installation files (quickstart jar plus any service pack zips).
4646
* Obtain a copy of your `licence.properties` file from you current AEM installation.
4747
* Create an `aem_cntrl-0.0.x-SNAPSHOT.jar` file from the [`aem_cntrl` project](https://github.com/4PointSolutions/aem-utils/tree/main/aem_cntrl).
48-
* Follow the instructions in the [`aem_container` project](https://github.com/4PointSolutions/aem-utils/blob/main/aem_container/README.md) to create a container image.
48+
* Follow the instructions in the [`aem_container` project](https://github.com/4PointSolutions/aem-utils/blob/main/aem_container/README.md) to create a base AEM container image.
49+
* Follow the instructions in the [test_containers ReadMe](https://github.com/4PointSolutions/FluentFormsAPI/blob/master/rest-services/test_containers/ReadMe.md) to create an integration test container image from the base AEM container image.
4950

5051
Once the container is built, configure the project as [outlined above](#containerized-aem-image-via-testcontainers) and run the tests.
5152

β€Žrest-services/test_containers/ReadMe.mdβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ In order to create an integration test container image, using the `ff_it_test` d
33
1. Create the `deploy_it_assets.jar` file in `ff_it_files` by following the "Creating deploy_it_assets.jar" instructions in `jbang_scripts\README.md`.
44
(This step is required because the .jar is not stored in the GitHub repository but it is required in order for the dockerfile to run.)
55
2. Alter the first line of the `ff_it_test.dockerfile` file to use the desired AEM base container image.
6+
3. If using the AEM LTS, alter the `ff_it_test.dockerfile` CMD line (at the end of the file) to launch the correct crx quickstart jar (e.g. `crx-quickstart/app/cq-quickstart-6.6.1-standalone-quickstart.jar` for 6.5 LTS SP1.
67
3. Run `docker buildx build --file ff_it_test.dockerfile -t aem_lts_it_tests:aem65lts_it_tests .` to create the integration test image.
78

89
After performing these steps then the integration tests should run successfully after `TestUtils.java` is modified to set

β€Žrest-services/test_containers/ff_it_test.dockerfileβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM aem:aem65lts AS ff_it_test
1+
FROM aem:aem65ltssp1 AS ff_it_test
22

33
ENV container="aem-lts-quickstart,aem-author,ubuntu,java21"
44

@@ -39,7 +39,7 @@ java -Xms1024m -Xmx2048m \
3939
-Djava.awt.headless=true \
4040
-Dsling.run.modes=author,crx3,crx3tar \
4141
-Djava.locale.providers=CLDR,JRE,SPI \
42-
-jar crx-quickstart/app/cq-quickstart-6.6.0-standalone-quickstart.jar \
42+
-jar crx-quickstart/app/cq-quickstart-6.6.1-standalone-quickstart.jar \
4343
start \
4444
-c crx-quickstart \
4545
-i launchpad \

0 commit comments

Comments
Β (0)