Skip to content

Commit 3d6c6b0

Browse files
authoredMar 12, 2025
Merge pull request #163 from psaini79/dboperator_1.2.0_release
Added Features of Oracle DB Operator Release 1.2.0
2 parents a834cfb + b2cd9b9 commit 3d6c6b0

File tree

496 files changed

+74952
-11904
lines changed

Some content is hidden

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

496 files changed

+74952
-11904
lines changed
 

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ords/*zip
77
.gitattributes
88
.vscode
99
.gitlab-ci.yml
10-
10+
.DS_Store
1111
# development
1212
.idea
1313
.local

‎Dockerfile

+11-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@
66
ARG BUILDER_IMG
77
FROM ${BUILDER_IMG} as builder
88

9-
# Download golang if BUILD_INTERNAL is set to true
9+
ARG TARGETARCH
10+
# Download golang if INSTALL_GO is set to true
1011
ARG INSTALL_GO
1112
ARG GOLANG_VERSION
1213
RUN if [ "$INSTALL_GO" = "true" ]; then \
13-
curl -LJO https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz &&\
14-
rm -rf /usr/local/go && tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-amd64.tar.gz &&\
15-
rm go${GOLANG_VERSION}.linux-amd64.tar.gz; \
14+
echo -e "\nCurrent Arch: $(arch), Downloading Go for linux/${TARGETARCH}" &&\
15+
curl -LJO https://go.dev/dl/go${GOLANG_VERSION}.linux-${TARGETARCH}.tar.gz &&\
16+
rm -rf /usr/local/go && tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-${TARGETARCH}.tar.gz &&\
17+
rm go${GOLANG_VERSION}.linux-${TARGETARCH}.tar.gz; \
18+
echo "Go Arch: $(/usr/local/go/bin/go env GOARCH)"; \
1619
fi
1720
ENV PATH=${GOLANG_VERSION:+"${PATH}:/usr/local/go/bin"}
1821

@@ -33,16 +36,17 @@ COPY LICENSE.txt LICENSE.txt
3336
COPY THIRD_PARTY_LICENSES_DOCKER.txt THIRD_PARTY_LICENSES_DOCKER.txt
3437

3538
# Build
36-
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
39+
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a -o manager main.go
3740

38-
# Use oraclelinux:8-slim as base image to package the manager binary
39-
FROM oraclelinux:8-slim
41+
# Use oraclelinux:9 as base image to package the manager binary
42+
FROM oraclelinux:9
4043
ARG CI_COMMIT_SHA
4144
ARG CI_COMMIT_BRANCH
4245
ENV COMMIT_SHA=${CI_COMMIT_SHA} \
4346
COMMIT_BRANCH=${CI_COMMIT_BRANCH}
4447
WORKDIR /
4548
COPY --from=builder /workspace/manager .
49+
COPY ords/ords_init.sh .
4650
RUN useradd -u 1002 nonroot
4751
USER nonroot
4852

0 commit comments

Comments
 (0)
Please sign in to comment.