Skip to content

Commit 04dbc92

Browse files
committed
Address review comments from Avi
Signed-off-by: Dongbo Xiao <dongbo.xiao@oracle.com>
1 parent 3535e01 commit 04dbc92

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

OracleWebLogic/samples/12213-webtier-apache/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ ENV FMW_PKG="fmw_12.2.1.3.0_wlsplugins_Disk1_1of1.zip" \
3434

3535
# Copy required files to build this image
3636
# ------------------------------------------------------
37-
COPY $FMW_PKG weblogic.conf httpd.conf /tmp/
37+
COPY $FMW_PKG /tmp/
38+
COPY weblogic.conf /etc/httpd/conf.d/
3839
COPY custom_mod_wl_apache.conf.sample /config/custom_mod_wl_apache.conf
3940
COPY container-scripts/* /u01/oracle/container-scripts/
4041

@@ -45,9 +46,9 @@ RUN yum install -y unzip && \
4546
unzip /tmp/$FMW_PKG -d /tmp && \
4647
unzip /tmp/$PLUGINS_PKG -d /tmp && \
4748
unzip /tmp/$PLUGIN_PKG -d $PLUGIN_HOME && \
48-
cat /tmp/httpd.conf > /etc/httpd/conf/httpd.conf && \
49-
cat /tmp/weblogic.conf >> /etc/httpd/conf/httpd.conf && \
50-
rm /tmp/$PLUGINS_PKG /tmp/WLSPlugin12.2.1.3.0-*.zip /tmp/$FMW_PKG /tmp/weblogic.conf /tmp/fmw_12213_readme*
49+
sed -i -e "s;logs/error_log;/proc/self/fd/2;" /etc/httpd/conf/httpd.conf && \
50+
sed -i -e "s;logs/access_log;/proc/self/fd/1;" /etc/httpd/conf/httpd.conf && \
51+
rm /tmp/$PLUGINS_PKG /tmp/WLSPlugin12.2.1.3.0-*.zip /tmp/$FMW_PKG /tmp/fmw_12213_readme*
5152

5253
#Expose ports
5354
EXPOSE 80

OracleWebLogic/samples/12213-webtier-apache/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This project includes a quick start Dockerfile and samples for standalone Apache
44

55
## How to Build Apache With Plugin Docker Image
66

7-
This project offers a Dockerfile for Apache Web Server with Oraacle WebLogic Server Proxy Plugin in standalone mode. To assist in building the images, you can use `buildDockerImage.sh` script. See below for instructions and usage.
7+
This project offers a Dockerfile for Apache Web Server with Oracle WebLogic Server Proxy Plugin in standalone mode. To assist in building the images, you can use `buildDockerImage.sh` script. See below for instructions and usage.
88

99
The `buildDockerImage.sh` script is just a utility shell script that performs MD5 checks and is an easy way for beginners to get started. Expert users are welcome to directly call docker build with their preferred set of parameters.
1010

OracleWebLogic/samples/12213-webtier-apache/container-scripts/run-httpd.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ set -e
55
rm -f /run/httpd/httpd.pid
66

77
exec httpd -DFOREGROUND
8-
9-
tail -f /var/log/httpd/access_log

0 commit comments

Comments
 (0)