Skip to content

Commit

Permalink
fixed copyright date
Browse files Browse the repository at this point in the history
  • Loading branch information
rosemarymarano committed May 23, 2018
1 parent 0c824d8 commit 064e658
Show file tree
Hide file tree
Showing 142 changed files with 636 additions and 659 deletions.
2 changes: 1 addition & 1 deletion OracleFMWInfrastructure/LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.

The Universal Permissive License (UPL), Version 1.0

Expand Down
4 changes: 2 additions & 2 deletions OracleFMWInfrastructure/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ You can also pull the Oracle Server JRE 8 image from the [Oracle Container Regis

LICENSE UPL 1.0

Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.

**IMPORTANT:** The resulting images will have a domain with an Administration Server and one Managed Server by default. You must extend the image with your own Dockerfile, and create your domain using WLST.

Expand Down Expand Up @@ -144,4 +144,4 @@ The database is created with the default password `Oradoc_db1`. To change the da
`$ docker run -d -p 9801:8001 --network=InfraNET --volumes-from InfraAdminContainer --name InfraManagedContainer --env-file ./infraServer.env.list oracle/fmw-infrastructure:12.2.1.x startManagedServer.sh`

## Copyright
Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
18 changes: 9 additions & 9 deletions OracleFMWInfrastructure/dockerfiles/12.2.1.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
#Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
# ORACLE DOCKERFILES PROJECT
# --------------------------
# This is the Dockerfile for Oracle FMW Infrastructure 12.2.1.2
#
#
# HOW TO BUILD THIS IMAGE
# -----------------------
# The Oracle FMW Infrastructure image extends the Oracle WebLogic Infrastructure 12.2.1.2 image, you must first build the Oracle WebLogic Infrastructure image.
# Run:
# Run:
# $ docker build -f Dockerfile -t oracle/fmw-infrastructure:12.2.1.2
#
# IMPORTANT
# ---------
# The resulting image of this Dockerfile contains a FMW Infra Base Domain.
#
# From
# From
# -------------------------
FROM oracle/serverjre:8

Expand All @@ -25,7 +25,7 @@ FROM oracle/serverjre:8
MAINTAINER Monica Riccelli <[email protected]>


# Common environment variables required for this build
# Common environment variables required for this build
# ----------------------------------------------------
ENV ORACLE_HOME=/u01/oracle \
SCRIPT_FILES=/u01/oracle/container-scripts/*.sh \
Expand All @@ -36,10 +36,10 @@ ENV ORACLE_HOME=/u01/oracle \
PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin:/u01/oracle/container-scripts


#USER root
#USER root
# Setup subdirectory for FMW install package and container-scripts
# -----------------------------------------------------------------
RUN mkdir -p /u01 && \
# -----------------------------------------------------------------
RUN mkdir -p /u01 && \
chmod a+xr /u01 && \
useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \
mkdir -p /u01/oracle/container-scripts
Expand Down Expand Up @@ -67,7 +67,7 @@ RUN chown oracle:oracle -R /u01 && \
VOLUME $VOLUME_DIR


# Install
# Install
# ------------------------------------------------------------
USER oracle
RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
#
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
Expand Down Expand Up @@ -143,7 +143,7 @@ def extendDomain(self, domainHome, db, dbPrefix, dbPassword):
cd('/')
for server in self.SERVERS:
if not server == 'AdminServer':
setServerGroups(server, serverGroupsToTarget)
setServerGroups(server, serverGroupsToTarget)
print "Set CoherenceClusterSystemResource to defaultCoherenceCluster for server:" + server
cd('/Servers/' + server)
set('CoherenceClusterSystemResource', 'defaultCoherenceCluster')
Expand All @@ -152,7 +152,7 @@ def extendDomain(self, domainHome, db, dbPrefix, dbPassword):
print "Set CoherenceClusterSystemResource to defaultCoherenceCluster for cluster:" + cluster
cd('/Cluster/' + cluster)
set('CoherenceClusterSystemResource', 'defaultCoherenceCluster')

print "Set WLS clusters as target of defaultCoherenceCluster:[" + ",".join(self.CLUSTERS) + "]"
cd('/CoherenceClusterSystemResource/defaultCoherenceCluster')
set('Target', ",".join(self.CLUSTERS))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Author:[email protected]
#
# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
Expand Down
2 changes: 1 addition & 1 deletion OracleFMWInfrastructure/dockerfiles/12.2.1.2/install.file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
[ENGINE]

#DO NOT CHANGE THIS.
Expand Down
20 changes: 10 additions & 10 deletions OracleFMWInfrastructure/dockerfiles/12.2.1.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
#Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
# ORACLE DOCKERFILES PROJECT
# --------------------------
# This is the Dockerfile for Oracle FMW Infrastructure 12.2.1.3
#
#
# HOW TO BUILD THIS IMAGE
# -----------------------
# The Oracle FMW Infrastructure image extends the Oracle WebLogic Infrastructure 12.2.1.3 image, you must first build the Oracle WebLogic Infrastructure image.
# Run:
# Run:
# $ docker build -f Dockerfile -t oracle/fmw-infrastructure:12.2.1.3
#
# IMPORTANT
# ---------
# The resulting image of this Dockerfile contains a FMW Infra Base Domain.
#
# From
# From
# -------------------------
FROM oracle/serverjre:8

Expand All @@ -25,7 +25,7 @@ FROM oracle/serverjre:8
MAINTAINER Monica Riccelli <[email protected]>


# Common environment variables required for this build
# Common environment variables required for this build
# ----------------------------------------------------
ENV ORACLE_HOME=/u01/oracle \
SCRIPT_FILE=/u01/oracle/container-scripts/* \
Expand All @@ -36,10 +36,10 @@ ENV ORACLE_HOME=/u01/oracle \
PATH=$PATH:/usr/java/default/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin:/u01/oracle/container-scripts


#USER root
#USER root
# Setup subdirectory for FMW install package and container-scripts
# -----------------------------------------------------------------
RUN mkdir -p /u01 && \
# -----------------------------------------------------------------
RUN mkdir -p /u01 && \
chmod a+xr /u01 && \
useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \
mkdir -p /u01/oracle/container-scripts
Expand All @@ -65,9 +65,9 @@ RUN chown oracle:oracle -R /u01 && \
chown -R oracle:oracle $VOLUME_DIR

VOLUME $VOLUME_DIR


# Install

# Install
# ------------------------------------------------------------
USER oracle
RUN cd /u01 && $JAVA_HOME/bin/jar xf /u01/$FMW_PKG && cd - && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
Expand Down Expand Up @@ -143,7 +143,7 @@ def extendDomain(self, domainHome, db, dbPrefix, dbPassword):
cd('/')
for server in self.SERVERS:
if not server == 'AdminServer':
setServerGroups(server, serverGroupsToTarget)
setServerGroups(server, serverGroupsToTarget)
print "Set CoherenceClusterSystemResource to defaultCoherenceCluster for server:" + server
cd('/Servers/' + server)
set('CoherenceClusterSystemResource', 'defaultCoherenceCluster')
Expand All @@ -152,7 +152,7 @@ def extendDomain(self, domainHome, db, dbPrefix, dbPassword):
print "Set CoherenceClusterSystemResource to defaultCoherenceCluster for cluster:" + cluster
cd('/Cluster/' + cluster)
set('CoherenceClusterSystemResource', 'defaultCoherenceCluster')

print "Set WLS clusters as target of defaultCoherenceCluster:[" + ",".join(self.CLUSTERS) + "]"
cd('/CoherenceClusterSystemResource/defaultCoherenceCluster')
set('Target', ",".join(self.CLUSTERS))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
#
#
# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
Expand Down Expand Up @@ -39,12 +39,12 @@ trap _term SIGTERM

# Set SIGKILL handler
trap _kill SIGKILL

echo "Configuring Domain for first time "
echo "If Domain has already been Configured"
echo "Start the Admin and Managed Servers "
echo "====================================="

# Check that the User has passed on all the details needed to configure this image
# Settings to call RCU....
echo "CONNECTION_STRING=${CONNECTION_STRING:?"Please set CONNECTION_STRING for connecting to the Database"}"
Expand Down Expand Up @@ -98,9 +98,9 @@ if [ ! -f ${DOMAIN_HOME}/servers/AdminServer/logs/AdminServer.log ]; then
fi

# Create Domain only if 1st execution
if [ $ADD_DOMAIN -eq 0 ];
if [ $ADD_DOMAIN -eq 0 ];
then

# Auto generate Oracle WebLogic Server admin password
if [ -z ${ADMIN_PASSWORD} ]
then
Expand All @@ -112,7 +112,7 @@ then
echo " ----> 'weblogic' admin password: $ADMIN_PASSWORD"
echo ""
fi;

if [ -z ${DB_SCHEMA_PASSWORD} ]
then
# Auto generate Oracle Database Schema password
Expand Down Expand Up @@ -144,50 +144,50 @@ then
# Run the RCU to load the schemas into the database
/u01/oracle/oracle_common/bin/rcu -silent -createRepository -databaseType ORACLE -connectString $CONNECTION_STRING -dbUser $DB_USERNAME -dbRole sysdba -useSamePasswordForAllSchemaUsers true -selectDependentsForComponents true -schemaPrefix $RCUPREFIX -component MDS -component MDS -component IAU -component IAU_APPEND -component IAU_VIEWER -component OPSS -component WLS -component STB -f < /u01/oracle/pwd.txt >> /u01/oracle/RCU.out
retval=$?
if [ $retval -ne 0 ];

if [ $retval -ne 0 ];
then
echo "RCU has some error "
#RCU was already called once and schemas are in the database
#continue with Domain creation
grep -q "RCU-6016 The specified prefix already exists" "/u01/oracle/RCU.out"
if [ $? -eq 0 ] ; then
echo "RCU has already loaded schemas into the Database"
echo "RCU Ignore error"
else
echo "RCU Ignore error"
else
echo "RCU Loading Failed.. Please check the RCU logs"
exit
fi
fi

# cleanup : remove the password file for security
rm -f "/u01/oracle/pwd.txt"
rm -f "/u01/oracle/pwd.txt"
fi

echo "Domain Configuration Phase"
echo "=========================="

wlst.sh -skipWLSModuleScanning /u01/oracle/container-scripts/createInfraDomain.py -oh $ORACLE_HOME -jh $JAVA_HOME -parent $DOMAIN_ROOT -name $DOMAIN_NAME -user $ADMIN_USER -password $ADMIN_PASSWORD -rcuDb $CONNECTION_STRING -rcuPrefix $RCUPREFIX -rcuSchemaPwd $DB_SCHEMA_PASSWORD
retval=$?

echo "RetVal from Domain creation $retval"
if [ $retval -ne 0 ];

if [ $retval -ne 0 ];
then
echo "Domain Creation Failed.. Please check the Domain Logs"
exit
fi

# Create the security file to start the server(s) without the password prompt
mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/
echo "username=weblogic" > ${DOMAIN_HOME}/servers/AdminServer/security/boot.properties
echo "password=$ADMIN_PASSWORD" >> ${DOMAIN_HOME}/servers/AdminServer/security/boot.properties
mkdir -p ${DOMAIN_HOME}/servers/AdminServer/security/
echo "username=weblogic" > ${DOMAIN_HOME}/servers/AdminServer/security/boot.properties
echo "password=$ADMIN_PASSWORD" >> ${DOMAIN_HOME}/servers/AdminServer/security/boot.properties

mkdir -p ${DOMAIN_HOME}/servers/infra_server1/security/
mkdir -p ${DOMAIN_HOME}/servers/infra_server1/security/
echo "username=weblogic" > ${DOMAIN_HOME}/servers/infra_server1/security/boot.properties
echo "password="$ADMIN_PASSWORD >> ${DOMAIN_HOME}/servers/infra_server1/security/boot.properties

${DOMAIN_HOME}/bin/setDomainEnv.sh
${DOMAIN_HOME}/bin/setDomainEnv.sh
fi

echo "Starting the Admin Server"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

#
# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Author:[email protected]
#
# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#
#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
#
Expand Down
2 changes: 1 addition & 1 deletion OracleFMWInfrastructure/dockerfiles/12.2.1.3/install.file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014-2017 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
[ENGINE]

#DO NOT CHANGE THIS.
Expand Down
19 changes: 9 additions & 10 deletions OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#!/bin/bash
#
#
# Since: October, 2014
# Author: [email protected]
# Description: script to build a Docker image for FMW Infrastructure
#
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
# Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
#
#
# Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
#

usage() {
cat << EOF
Usage: buildDockerImage.sh -v [version] [-s] [-c]
Builds a Docker Image for Oracle FMW Infrastructure.
Parameters:
-v: version to build. Required.
Choose one of: $(for i in $(ls -d */); do echo -n "${i%%/} "; done)
Expand All @@ -24,7 +24,7 @@ Parameters:
LICENSE UPL 1.0
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
EOF
exit 0
Expand Down Expand Up @@ -131,8 +131,8 @@ echo ""

if [ $? -eq 0 ]; then
cat << EOF
Fusion Middleware Infrastructure Docker Image for version $VERSION is ready to be extended:
Fusion Middleware Infrastructure Docker Image for version $VERSION is ready to be extended:
--> $IMAGE_NAME
Build completed in $BUILD_ELAPSED seconds.
Expand All @@ -141,4 +141,3 @@ EOF
else
echo "FMW Infrastructure Docker Image was NOT successfully created. Check the output and correct any reported problems with the docker build operation."
fi

Loading

0 comments on commit 064e658

Please sign in to comment.