Skip to content

Commit

Permalink
Fix typos and fix oracle#588 (oracle#612)
Browse files Browse the repository at this point in the history
* Fix for oracle#523

* Keep in sync with 12.1 script

* Further reduce image sizes

* Fix typo in checkSpace.sh script

* Fix typo

* Fix for oracle#588
  • Loading branch information
gvenzl authored and Djelibeybi committed Oct 24, 2017
1 parent 6064d3d commit 3dbde1c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions OracleDatabase/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ To run your Oracle Database Docker image use the **docker run** command as follo
The character set to use when creating the database (default: AL32UTF8)
-v /opt/oracle/oradata
The data volume to use for the database.
Has to be owned by the Unix user "oracle" or set appropriately.
Has to be writable by the Unix "oracle" (uid: 54321) user inside the container!
If omitted the database will not be persisted over container recreation.
-v /opt/oracle/scripts/startup | /docker-entrypoint-initdb.d/startup
Optional: A volume with custom scripts to be run after database startup.
Expand Down Expand Up @@ -119,7 +119,7 @@ To run your Oracle Database Express Edition Docker image use the **docker run**

-v /u01/app/oracle/oradata
The data volume to use for the database.
Has to be owned by the Unix user "oracle" or set appropriately.
Has to be writable by the Unix "oracle" (uid: 54321) user inside the container!
If omitted the database will not be persisted over container recreation.
-v /u01/app/oracle/scripts/startup | /docker-entrypoint-initdb.d
Optional: A volume with custom scripts to be run after database startup.
Expand Down
2 changes: 1 addition & 1 deletion OracleDatabase/dockerfiles/12.1.0.2/checkSpace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [ $AVAILABLE_SPACE_GB -lt $REQUIRED_SPACE_GB ]; then
script_name=`basename "$0"`
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "$script_name: ERROR - There is not enough space available in the docker container."
echo "$script_name: The container needs at least $REQUIRED_SPACE_GB GB , but only $AVAILABLE_SPACE_GB available."
echo "$script_name: The container needs at least $REQUIRED_SPACE_GB GB, but only $AVAILABLE_SPACE_GB GB are available."
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
exit 1;
fi;
2 changes: 1 addition & 1 deletion OracleDatabase/dockerfiles/12.2.0.1/checkSpace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if [ $AVAILABLE_SPACE_GB -lt $REQUIRED_SPACE_GB ]; then
script_name=`basename "$0"`
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "$script_name: ERROR - There is not enough space available in the docker container."
echo "$script_name: The container needs at least $REQUIRED_SPACE_GB GB , but only $AVAILABLE_SPACE_GB available."
echo "$script_name: The container needs at least $REQUIRED_SPACE_GB GB, but only $AVAILABLE_SPACE_GB GB are available."
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
exit 1;
fi;
1 change: 0 additions & 1 deletion OracleDatabase/samples/prebuiltdb/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Example of creating an image with pre-built DB
=================================================
***Warning: The description below requires changes in the dockerfile related to the version and edition in question (docker-images/OracleDatabase/dockerfiles/$VERSION/Dockerfile.$EDITION). It's recommended that you revert the changes after you have completed creating image without VOLUME (see next section).***

## 1. Create an image without a VOLUME
Expand Down

0 comments on commit 3dbde1c

Please sign in to comment.