Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use adoptium openjdk #6

Merged
merged 10 commits into from
Aug 23, 2024
Merged

feat: use adoptium openjdk #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3bfdfa6
feat: use adoptium for openjdk 8
andrwils Aug 14, 2024
5b17a47
feat: set context to pub
andrwils Aug 14, 2024
c3f62d2
feat: increase deploy timout
andrwils Aug 15, 2024
0f64f7a
feat: use adoptium
andrwils Aug 15, 2024
18c34ea
feat: decrease deployment timeout
andrwils Aug 15, 2024
c32d1c7
feat: use adoptium api
andrwils Aug 15, 2024
99b2338
feat: use proxy for jdk
andrwils Aug 15, 2024
2b543fc
feat: use tomcat 9
andrwils Aug 15, 2024
09df12d
feat: display java and tomcat version
andrwils Aug 23, 2024
318c468
feat: use default jdk (#5)
andrwils Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,6 @@ jobs:
ARTIFACT_SHA256: ${{ needs.deploy-build.outputs.artifact_sha256 || needs.deploy-tag.outputs.artifact_sha256 }}
DOWNLOAD_URL: ${{ needs.deploy-build.outputs.download_url || needs.deploy-tag.outputs.download_url }}
# The automatically generated GitHub token will expire when the workflow ends. We need to wait so the job has time to clone the repo.
- name: Sleep for 30 seconds
run: sleep 30s
- name: Sleep
run: sleep 90s
shell: bash
11 changes: 3 additions & 8 deletions playbooks/playbook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,15 @@
# individual JDK installation
- name: jdk
vars:
jdk_version:
type: 'openjdk'
major_version: 8
url: '{{ artifactory_url }}/ext-binaries-local/openjdk/java-se-8u40-ri.tar.gz'
filename: 'java-se-8u40-ri.tar.gz'
checksum: 'sha1:606984531e3eeddba6be5ac626a229ef283c5de0'
cacerts_path: 'jre/lib/security/cacerts'
use_proxy: false
proxy_env: "{{ env_vars }}"

# create a self signed certificate to allow for HTTPS
- name: self_signed_cert

# install & configure the Tomcat container
- name: tomcat
vars:
tomcat_major_version: '9'

# deploy the webapp
- name: webapp
Expand Down
2 changes: 1 addition & 1 deletion playbooks/vars/standard/all.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pd_prop_build_number: "{{ lookup('ansible.builtin.env', 'PODMAN_BUILD_NUMBER') }
pd_prop_service_install_directory: "{{ pd_prop_project_version }}-{{ pd_prop_build_number }}"

# The following properties are custom to each particular service
context: ext#oneteam-example
context: pub#oneteam-example

# By default, the Tomcat port is set dynamically by using the port_manager role
# If you need to set a static port, replace the dynamic port assignment value with your static value
Expand Down
4 changes: 4 additions & 0 deletions src/main/webapp/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@
e.printStackTrace();
}
String timestamp = (String) application.getAttribute("deploymentTimestamp");
String javaRuntimeVersion = System.getProperty("java.runtime.version");
String tomcatVersion = application.getServerInfo();
%>
<html>
<body>
<h2>Hello World!</h2>
<p>Version: <%= version %></p>
<p>Deployed at: <%= timestamp %></p>
<p>Java Runtime: <%= javaRuntimeVersion %></p>
<p>Tomcat Version: <%= tomcatVersion %></p>
</body>
</html>