Produced by Araxis Merge on 6/18/2018 3:37:03 PM Eastern Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | CTT_DM2_v7.zip\CTT_ntrt-jira-ssoi-authenticator\authenticator\src\test\docker\apache | Dockerfile | Tue Jun 12 16:41:44 2018 UTC |
| 2 | CTT_DM2_v7.zip\CTT_ntrt-jira-ssoi-authenticator\authenticator\src\test\docker\apache | Dockerfile | Tue Jun 12 21:07:41 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 24 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | FROM cento s:6.9 | |
| 2 | ||
| 3 | ENV HOSTNA ME DNS | |
| 4 | ||
| 5 | RUN yum -y install v im httpd m od_ssl | |
| 6 | ||
| 7 | COPY conf/ httpd.conf /etc/http d/conf/ | |
| 8 | COPY conf/ proxy.conf /etc/http d/conf.d/ | |
| 9 | COPY conf/ ssl.conf / etc/httpd/ conf.d/ | |
| 10 | COPY build /apache.cr t /etc/pki /tls/certs / | |
| 11 | COPY build /apache.ke y /etc/pki /tls/priva te/ | |
| 12 | ||
| 13 | CMD apache ctl start && tail -F /etc/http d/logs/err or_log |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.