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.amd64 b/Dockerfile similarity index 65% rename from Dockerfile.amd64 rename to Dockerfile index c105673..502f13e 100644 --- a/Dockerfile.amd64 +++ 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.26.10 kubectl-1.26.10 kubelet-1.26.10 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index 7bcce78..0000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,3 +0,0 @@ -FROM almalinux:9 -COPY kubernetes-aarch64.repo /etc/yum.repos.d -RUN yum -y install kubeadm-1.26.10 kubectl-1.26.10 kubelet-1.26.10 diff --git a/kubernetes-aarch64.repo b/kubernetes-aarch64.repo deleted file mode 100644 index d57dca0..0000000 --- a/kubernetes-aarch64.repo +++ /dev/null @@ -1,7 +0,0 @@ -[kubernetes] -name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-aarch64 -enabled=1 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg diff --git a/kubernetes-amd64.repo b/kubernetes-amd64.repo deleted file mode 100644 index 65eda50..0000000 --- a/kubernetes-amd64.repo +++ /dev/null @@ -1,7 +0,0 @@ -[kubernetes] -name=Kubernetes -baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 -enabled=1 -gpgcheck=1 -repo_gpgcheck=1 -gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg diff --git a/kubernetes.repo b/kubernetes.repo new file mode 100644 index 0000000..400fa26 --- /dev/null +++ b/kubernetes.repo @@ -0,0 +1,6 @@ +[kubernetes] +name=Kubernetes +baseurl=https://pkgs.k8s.io/core:/stable:/v1.26/rpm/ +enabled=1 +gpgcheck=1 +gpgkey=https://pkgs.k8s.io/core:/stable:/v1.26/rpm/repodata/repomd.xml.key