Updated to Redhat 8 Universal Base Image. (#24)

Author: rbotha78

CODE_OF_CONDUCT.md

@@ -10,19 +10,19 @@ We pledge to act and interact in ways that contribute to an open, welcoming, div
 
 Examples of behavior that contribute to a positive environment for our project and community include:
 
-*	Demonstrating empathy and kindness toward other people
-*	Being respectful of differing opinions, viewpoints, and experiences
-*	Giving and gracefully accepting constructive feedback
-*	Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-*	Focusing on what is best, not just for us as individuals but for the overall community
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best, not just for us as individuals but for the overall community
 
 Examples of unacceptable behavior include:
 
-*	The use of sexualized language or imagery, and sexual attention or advances of any kind
-*	Trolling, insulting or derogatory comments, and personal or political attacks
-*	Public or private harassment
-*	Publishing others’ private information, such as a physical or email address, without their explicit permission
-*	Other conduct which could reasonably be considered inappropriate in a professional setting
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others’ private information, such as a physical or email address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities
 
@@ -36,7 +36,7 @@ This Code of Conduct applies when an individual is representing the project or i
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by first contacting the project team. Oversight of Adobe projects is handled by the Adobe Open Source Office, which has final say in any violations and enforcement of this Code of Conduct and can be reached at [email protected]. All complaints will be reviewed and investigated promptly and fairly.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by first contacting the project team. Oversight of Adobe projects is handled by the Adobe Open Source Office, which has final say in any violations and enforcement of this Code of Conduct and can be reached at <[email protected]>. All complaints will be reviewed and investigated promptly and fairly.
 
 The project team must respect the privacy and security of the reporter of any incident.
 
@@ -46,25 +46,25 @@ Project maintainers who do not follow or enforce the Code of Conduct may face te
 
 Project maintainers will follow these Community Impact Guidelines in determining the consequences for any action they deem to be in violation of this Code of Conduct:
 
-**1. Correction**
+### 1. Correction
 
 Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
 
 Consequence: A private, written warning from project maintainers describing the violation and why the behavior was unacceptable. A public apology may be requested from the violator before any further involvement in the project by violator.
 
-**2. Warning**
+### 2. Warning
 
 Community Impact: A relatively minor violation through a single incident or series of actions.
 
 Consequence: A written warning from project maintainers that includes stated consequences for continued unacceptable behavior. Violator must refrain from interacting with the people involved for a specified period of time as determined by the project maintainers, including, but not limited to, unsolicited interaction with those enforcing the Code of Conduct through channels such as community spaces and social media. Continued violations may lead to a temporary or permanent ban.
 
-**3. Temporary Ban**
+### 3. Temporary Ban
 
 Community Impact: A more serious violation of community standards, including sustained unacceptable behavior.
 
 Consequence: A temporary ban from any interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Failure to comply with the temporary ban may lead to a permanent ban.
 
-**4. Permanent Ban**
+### 4. Permanent Ban
 
 Community Impact: Demonstrating a consistent pattern of violation of community standards or an egregious violation of community standards, including, but not limited to, sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
 
@@ -76,4 +76,4 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], versi
 available at [http://contributor-covenant.org/version/2/1][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/2/1
+[version]: http://contributor-covenant.org/version/2/1

CONTRIBUTING.md

@@ -44,4 +44,4 @@ feel free to reach out to existing committers to have a conversation about that.
 
 ## Security Issues
 
-Security issues shouldn't be reported on this issue tracker. Instead, [file an issue to our security experts](https://helpx.adobe.com/security/alertus.html).
+Security issues shouldn't be reported on this issue tracker. Instead, [file an issue to our security experts](https://helpx.adobe.com/security/alertus.html).

Dockerfile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Adobe Systems Incorporated. All rights reserved.
+# Copyright (c) 2024 Adobe Systems Incorporated. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM --platform=$TARGETPLATFORM centos:7
+FROM --platform=$TARGETPLATFORM redhat/ubi8:8.8
 
 # Install HTTPD
-RUN yum -y update && yum -y install httpd mod_ssl procps haproxy iputils tree telnet less && yum clean all
+RUN yum -y update && yum -y install httpd mod_ssl procps haproxy iputils less openssl && yum clean all
 
-# Remove default CentOS config
+# Remove default httpd config
 RUN rm -rf /etc/httpd/conf/* && rm -rf /etc/httpd/conf.d/* && rm -rf /etc/httpd/conf.modules.d/*
 
 # Copy the AMS base files into the image.

LICENSE

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 [name of copyright owner]
+   Copyright 2024 Adobe Systems Incorporated.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

NOTICE

@@ -1,5 +1,5 @@
 AEM Dispatcher Docker Container
-Copyright 2023 Adobe Systems Incorporated
+Copyright 2024 Adobe Systems Incorporated
 
 This software is licensed under the Apache License, Version 2.0 (see
 LICENSE file).

PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 <!--- Include details of your testing environment, and the tests you ran to -->
 <!--- see how your change affects other areas of the code, etc. -->
 
-## Screenshots (if appropriate):
+## Screenshots (if appropriate)
 
 ## Types of changes
 
@@ -31,7 +31,7 @@
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
 
-## Checklist:
+## Checklist
 
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
@@ -42,4 +42,4 @@
 - [ ] I have updated the documentation accordingly.
 - [ ] I have read the **CONTRIBUTING** document.
 - [ ] I have added tests to cover my changes.
-- [ ] All new and existing tests passed.
+- [ ] All new and existing tests passed.

README.md

@@ -2,7 +2,7 @@
 # Dispatcher Docker image
 
 This is a simple dispatcher image that is very close to an AMS setup.
-It builds on top of [centos7](https://hub.docker.com/_/centos/) since the AMS dispatcher is build on top of Redhat Enterprise Linux 7.7 and contains the default AMS Dispatcher 2.6 configuration.
+It builds on top of [Redhat Universal Base Image 8.8](https://hub.docker.com/r/redhat/ubi8) and contains the default AMS Dispatcher 2.6 configuration.
 
 The default publish host has been set to `publish.docker.local` and the default renderer is set to `host.docker.internal:4503` which should point to the AEM instance running on your local computer.
 
@@ -21,7 +21,7 @@ docker buildx create --use
 docker buildx build --load -t dispatcher --platform=linux/amd64 .
 ```
 
-To build for Apple M1/M2, use `--platform=linux/arm64` instead
+To build for Apple Silicon or Windows ARM, use `--platform=linux/arm64` instead
 
 Multi-arch images can be built, but can only be pushed to a remote registry and not be directly loaded in Docker desktop.
 
@@ -61,8 +61,7 @@ docker run -p 80:8080 -p 443:8443 -itd --rm --env-file scripts/env.sh --name dis
 
 ### Using Docker Compose
 
-Provided `docker-compose.yaml` can be modified to suit your needs. In a typical scenario you would incorporate it to your 
-own Docker Compose configuration. 
+Provided `docker-compose.yaml` can be modified to suit your needs. In a typical scenario you would incorporate it to your own Docker Compose configuration.
 
 You can start dispatcher with Docker Compose using script `dispatcher-docker-compose`
 
@@ -74,7 +73,6 @@ Following folders are mounted from the host os to make it easier to inspect cach
 | mnt/publish_docroot  | Publish cached files                                         |
 | mnt/log              | Dispatcher logs                                              |
 
-
 ## Checking the container's current state
 
 ```shell
@@ -85,7 +83,7 @@ CONTAINER ID   IMAGE        COMMAND                  CREATED              STATUS
 
 ## Testing your AEM installation
 
-The dispatcher maps `publish.docker.local` to the local publisher instance on port 4503. 
+The dispatcher maps `publish.docker.local` to the local publisher instance on port 4503.
 Run the publisher and navigate to [http://we-retail.docker.local/content/we-retail/language-masters/en.html](http://we-retail.docker.local/content/we-retail/language-masters/en.html)
 
 ## Adapting your localhost

haproxy/haproxy.cfg

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Adobe Systems Incorporated. All rights reserved.
+# Copyright (c) 2024 Adobe Systems Incorporated. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

scripts/env.sh

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023 Adobe Systems Incorporated. All rights reserved.
+# Copyright (c) 2024 Adobe Systems Incorporated. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

scripts/launch.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2023 Adobe Systems Incorporated. All rights reserved.
+# Copyright (c) 2024 Adobe Systems Incorporated. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.