From c2c363a9c2a34ff28a465a5d9dbb7223b81432a1 Mon Sep 17 00:00:00 2001 From: Alan Peng Date: Wed, 25 Oct 2023 22:23:26 +0800 Subject: [PATCH] Changing The Kubernetes Package Repository --- .circleci/config.yml | 8 ++++---- Dockerfile.aarch64 => Dockerfile | 2 +- Dockerfile.amd64 | 3 --- kubernetes-amd64.repo | 6 ------ kubernetes-aarch64.repo => kubernetes.repo | 0 5 files changed, 5 insertions(+), 14 deletions(-) rename Dockerfile.aarch64 => Dockerfile (64%) delete mode 100644 Dockerfile.amd64 delete mode 100644 kubernetes-amd64.repo rename kubernetes-aarch64.repo => kubernetes.repo (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 566d75a..e8a645e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: - run: name: Build an amd64 container image command: | - docker build -f Dockerfile.amd64 -t wise2c/kubeadm-version:amd64-$CIRCLE_BRANCH . + docker build -t wise2c/kubeadm-version:amd64-$CIRCLE_BRANCH . docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker push wise2c/kubeadm-version:amd64-$CIRCLE_BRANCH docker run --rm --name=kubeadm-version wise2c/kubeadm-version:amd64-$CIRCLE_BRANCH kubeadm config images list @@ -18,7 +18,7 @@ jobs: - run: name: Build an amd64 container image command: | - docker build -f Dockerfile.amd64 -t wise2c/kubeadm-version:amd64-$CIRCLE_TAG . + docker build -t wise2c/kubeadm-version:amd64-$CIRCLE_TAG . docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker push wise2c/kubeadm-version:amd64-$CIRCLE_TAG docker run --rm --name=kubeadm-version wise2c/kubeadm-version:amd64-$CIRCLE_TAG kubeadm config images list --kubernetes-version $CIRCLE_TAG @@ -31,7 +31,7 @@ jobs: - run: name: Build an aarch64 container image command: | - docker build -f Dockerfile.aarch64 -t wise2c/kubeadm-version:aarch64-$CIRCLE_BRANCH . + docker build -t wise2c/kubeadm-version:aarch64-$CIRCLE_BRANCH . docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker push wise2c/kubeadm-version:aarch64-$CIRCLE_BRANCH docker run --rm --name=kubeadm-version wise2c/kubeadm-version:aarch64-$CIRCLE_BRANCH kubeadm config images list @@ -44,7 +44,7 @@ jobs: - run: name: Build an aarch64 container image command: | - docker build -f Dockerfile.aarch64 -t wise2c/kubeadm-version:aarch64-$CIRCLE_TAG . + docker build -t wise2c/kubeadm-version:aarch64-$CIRCLE_TAG . docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD docker push wise2c/kubeadm-version:aarch64-$CIRCLE_TAG docker run --rm --name=kubeadm-version wise2c/kubeadm-version:aarch64-$CIRCLE_TAG kubeadm config images list --kubernetes-version $CIRCLE_TAG diff --git a/Dockerfile.aarch64 b/Dockerfile similarity index 64% rename from Dockerfile.aarch64 rename to Dockerfile index 1d55867..83e75fe 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile @@ -1,3 +1,3 @@ FROM almalinux:9 -COPY kubernetes-amd64.repo /etc/yum.repos.d +COPY kubernetes.repo /etc/yum.repos.d RUN yum -y install kubeadm-1.28.3 kubectl-1.28.3 kubelet-1.28.3 diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 deleted file mode 100644 index 1d55867..0000000 --- a/Dockerfile.amd64 +++ /dev/null @@ -1,3 +0,0 @@ -FROM almalinux:9 -COPY kubernetes-amd64.repo /etc/yum.repos.d -RUN yum -y install kubeadm-1.28.3 kubectl-1.28.3 kubelet-1.28.3 diff --git a/kubernetes-amd64.repo b/kubernetes-amd64.repo deleted file mode 100644 index 0ebd03b..0000000 --- a/kubernetes-amd64.repo +++ /dev/null @@ -1,6 +0,0 @@ -[kubernetes] -name=Kubernetes -baseurl=https://pkgs.k8s.io/core:/stable:/v1.28/rpm/ -enabled=1 -gpgcheck=1 -gpgkey=https://pkgs.k8s.io/core:/stable:/v1.28/rpm/repodata/repomd.xml.key diff --git a/kubernetes-aarch64.repo b/kubernetes.repo similarity index 100% rename from kubernetes-aarch64.repo rename to kubernetes.repo