Skip to content

Commit 5ee2820

Browse files
authored
Merge branch 'oracle:main' into main
2 parents 19e8a8e + c13f8df commit 5ee2820

File tree

208 files changed

+27124
-2072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+27124
-2072
lines changed

OracleDatabase/RAC/OracleDNSServer/dockerfiles/buildContainerImage.sh renamed to OracleDatabase/RAC/OracleDNSServer/containerfiles/buildContainerImage.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
88
#
9-
# Copyright (c) 2018-2024 Oracle and/or its affiliates.
9+
# Copyright (c) 2018-2025 Oracle and/or its affiliates.
1010
#
1111
# shellcheck disable=SC2154
1212
usage() {
@@ -121,7 +121,7 @@ echo "Building image '$IMAGE_NAME' ..."
121121

122122
# BUILD THE IMAGE (replace all environment variables)
123123
BUILD_START=$(date '+%s')
124-
if docker build --force-rm=true --no-cache=true "${DOCKEROPS[@]}" "${PROXY_SETTINGS[@]}" -t "$IMAGE_NAME" -f Dockerfile .; then
124+
if docker build --force-rm=true --no-cache=true "${DOCKEROPS[@]}" "${PROXY_SETTINGS[@]}" -t "$IMAGE_NAME" -f Containerfile .; then
125125
BUILD_END=$(date '+%s')
126126
BUILD_ELAPSED=$((BUILD_END - BUILD_START))
127127

OracleDatabase/RAC/OracleDNSServer/dockerfiles/latest/Dockerfile renamed to OracleDatabase/RAC/OracleDNSServer/containerfiles/latest/Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# LICENSE UPL 1.0
22
#
3-
# Copyright (c) 2018-2024 Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2018-2025 Oracle and/or its affiliates. All rights reserved.
44
#
55
# ORACLE DOCKERFILES PROJECT
66
# --------------------------

OracleDatabase/RAC/OracleDNSServer/dockerfiles/latest/checkSpace.sh renamed to OracleDatabase/RAC/OracleDNSServer/containerfiles/latest/checkSpace.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# LICENSE UPL 1.0
33
#
4-
# Copyright (c) 2018-2024 Oracle and/or its affiliates. All rights reserved.
4+
# Copyright (c) 2018-2025 Oracle and/or its affiliates. All rights reserved.
55
#
66
# Since: January, 2018
77
# Author: paramdeep.saini@oracle.com, sanjay.singh@oracle.com

OracleDatabase/RAC/OracleDNSServer/dockerfiles/latest/functions.sh renamed to OracleDatabase/RAC/OracleDNSServer/containerfiles/latest/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# LICENSE UPL 1.0
33
#
4-
# Copyright (c) 2018-2024 Oracle and/or its affiliates. All rights reserved.
4+
# Copyright (c) 2018-2025 Oracle and/or its affiliates. All rights reserved.
55
#
66
# Since: January, 2018
77
# Author: paramdeep.saini@oracle.com

0 commit comments

Comments
 (0)