Skip to content

Use common base image #28

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 1 commit into
base: oracle-template
Choose a base branch
from
Open

Use common base image #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions build-k8s-docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ for BINARY in ${KUBE_BINARY}; do
cp ${BINARY_LOCATION}/${BINARY} .

if [[ ${4} == 9 ]] ; then
docker build --pull=never --squash --network=host --build-arg https_proxy=${https_proxy} --build-arg VERSION=${VERSION} --build-arg BINARY=${BINARY} -t ${REGISTRY}/${BINARY}:${VERSION} -f ${DOCKER_FILE_PATH} .
docker build --squash --network=host --build-arg https_proxy=${https_proxy} --build-arg VERSION=${VERSION} --build-arg BINARY=${BINARY} -t ${REGISTRY}/${BINARY}:${VERSION} -f ${DOCKER_FILE_PATH} .
else
docker build --pull=never --squash --build-arg https_proxy=${https_proxy} --build-arg VERSION=${VERSION} --build-arg BINARY=${BINARY} -t ${REGISTRY}/${BINARY}:${VERSION} -f ${DOCKER_FILE_PATH} .
docker build --squash --build-arg https_proxy=${https_proxy} --build-arg VERSION=${VERSION} --build-arg BINARY=${BINARY} -t ${REGISTRY}/${BINARY}:${VERSION} -f ${DOCKER_FILE_PATH} .
fi
docker save -o ${BINARY_LOCATION}/oracle_docker/${BINARY}.tar ${REGISTRY}/${BINARY}:${VERSION}
done
Expand All @@ -60,9 +60,9 @@ cp LICENSE kube-proxy/.
cp THIRD_PARTY_LICENSES.txt kube-proxy/.
pushd kube-proxy/
if [[ ${4} == 9 ]] ; then
docker build --pull=never --squash --network=host --build-arg https_proxy=${https_proxy} --build-arg VERSION=${VERSION} -t ${REGISTRY}/${BINARY}:${VERSION} -f ./Dockerfile.kube-proxy .
docker build --squash --network=host --build-arg https_proxy=${https_proxy} --build-arg VERSION=${VERSION} -t ${REGISTRY}/${BINARY}:${VERSION} -f ./Dockerfile.kube-proxy .
else
docker build --pull=never --squash --build-arg https_proxy=${https_proxy} --build-arg VERSION=${VERSION} -t ${REGISTRY}/${BINARY}:${VERSION} -f ./Dockerfile.kube-proxy .
docker build --squash --build-arg https_proxy=${https_proxy} --build-arg VERSION=${VERSION} -t ${REGISTRY}/${BINARY}:${VERSION} -f ./Dockerfile.kube-proxy .
fi
popd
docker save -o ${BINARY_LOCATION}/oracle_docker/${BINARY}.tar ${REGISTRY}/${BINARY}:${VERSION}
2 changes: 1 addition & 1 deletion buildrpm/kube-proxy/Dockerfile.kube-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM container-registry.oracle.com/os/oraclelinux:8
FROM container-registry.oracle.com/olcne/ock:base-image
RUN dnf install yum iptables ebtables conntrack kmod ipset tar which && dnf clean all
ADD kube-proxy /usr/local/bin/kube-proxy

Expand Down
2 changes: 1 addition & 1 deletion olm/builds/Dockerfile.oracle.ol8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM container-registry.oracle.com/os/oraclelinux:8
FROM container-registry.oracle.com/olcne/ock:base-image
ARG BINARY
ARG VERSION

Expand Down
5 changes: 1 addition & 4 deletions olm/jenkins/ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@Library('olcne-pipeline') _
import com.oracle.olcne.pipeline.BranchPattern

String container_registry_namespace = "olcne"
String kubernetes_version = "{{{ .major }}}.{{{ .minor }}}.{{{ .patch }}}";
String kubernetes_image_tag = "v" + kubernetes_version;
String registry = "container-registry.oracle.com/" + container_registry_namespace;
Expand All @@ -24,8 +25,4 @@ olcnePipeline(
],
],
architectures: ['x86_64', 'aarch64'],
preBuildCommands: [
'podman pull container-registry.oracle.com/olcne/base:latest',
'podman tag container-registry.oracle.com/olcne/base:latest container-registry.oracle.com/os/oraclelinux:8',
],
)