Skip to content

Fix/aditya059/fix for sharding repo name changes #2930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fix/aditya059/fix for sharding repo name changes #2930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
49b2992
Replaced 23.5 with 23.6 dockerfiles
aditya059 Jan 9, 2025
19e8a8e
Merge branch 'oracle:main' into main
aditya059 Jan 23, 2025
5ee2820
Merge branch 'oracle:main' into main
aditya059 Feb 26, 2025
ce2c350
Updated repo name
aditya059 Feb 26, 2025
da02705
Fixed lint errors
aditya059 Feb 26, 2025
083442b
Merge branch 'oracle:main' into main
aditya059 Apr 2, 2025
94681c8
Merge remote-tracking branch 'origin/main' into fix/aditya059/fix_for…
aditya059 Apr 2, 2025
8172e00
Fixed sharding file path
aditya059 Apr 2, 2025
ee47da6
Fixed lint error
aditya059 Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion OracleDatabase/SingleInstance/extensions/sharding/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ RUN yum -y install gzip tar && \
tar -xvf master.tar.gz

# Creating another stage for sharding extension creation
# hadolint ignore=DL3006
FROM ${BASE_IMAGE}
# Extn name
ARG EXTENSION_NAME=sharding
Expand Down Expand Up @@ -61,7 +62,7 @@ RUN if test -e "$ORACLE_BASE/$RUN_FILE.orig"; then EXTN='extended'; else EXTN='o
mv "$ORACLE_BASE/$RUN_FILE" "$ORACLE_BASE/$RUN_FILE.$EXTN"

# Copy updated scripts for sharding support
COPY --chown=oracle:dba --from=downloader /tmp/db-sharding-master/docker-based-sharding-deployment/dockerfiles/${BASE_IMAGE_VERSION}/scripts/* $ORACLE_BASE/scripts/sharding/
COPY --chown=oracle:dba --from=downloader /tmp/db-sharding-master/container-based-sharding-deployment/containerfiles/scripts/* $ORACLE_BASE/scripts/sharding/
RUN mv "$ORACLE_BASE/scripts/sharding/$RUN_FILE" "$ORACLE_BASE/$RUN_FILE.$EXTENSION_NAME"

# Set perms and append a call to main runOracle
Expand Down
6 changes: 3 additions & 3 deletions OracleDatabase/SingleInstance/extensions/sharding/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The Sharding Extension
The sharding extension is required to build the catalog and shard containers. When
the SingleInstance container image is extended with the **sharding** extension, it downloads the
required scripts from [db-sharding/docker-based-sharding-deployment](https://github.com/oracle/db-sharding/tree/master/docker-based-sharding-deployment)
the SingleInstance container image is extended with the **sharding** extension, it downloads the
required scripts from [db-sharding/container-based-sharding-deployment](https://github.com/oracle/db-sharding/tree/master/container-based-sharding-deployment)
repository, and packages them with the SingleInstance container image to form an extended image.

More information on catalog and shard containers can be found at `db-sharding/docker-based-sharding-deployment` [README](https://github.com/oracle/db-sharding/blob/master/docker-based-sharding-deployment/README.md).
More information on catalog and shard containers can be found at `db-sharding/container-based-sharding-deployment` [README](https://github.com/oracle/db-sharding/blob/master/container-based-sharding-deployment/README.md).