From 571854b824291fc501516c43b2cb62850382a96e Mon Sep 17 00:00:00 2001 From: Viktar Mikalayeu Date: Tue, 17 Oct 2023 17:09:29 +0400 Subject: [PATCH 1/3] update docker tolls --- docker/tools/Dockerfile_ARM | 2 +- docker/tools/Dockerfile_x86 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/tools/Dockerfile_ARM b/docker/tools/Dockerfile_ARM index f2ac0e3c..f0d092c7 100644 --- a/docker/tools/Dockerfile_ARM +++ b/docker/tools/Dockerfile_ARM @@ -7,7 +7,7 @@ RUN echo '[mongodb-org-4.4]'>/etc/yum.repos.d/mongodb-org-4.0.repo && \ echo 'enabled=1'>>/etc/yum.repos.d/mongodb-org-4.0.repo && \ echo 'gpgkey=https://www.mongodb.org/static/pgp/server-4.4.asc'>>/etc/yum.repos.d/mongodb-org-4.0.repo && \ amazon-linux-extras install postgresql13 -y && \ - yum install mongodb-org-tools mongodb-org-shell tar git mysql -y && \ + yum install mongodb-org-tools mongodb-org-shell tar git mysql bind-utils bash-completion -y && \ curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-arm64 && \ install skaffold /usr/local/bin/ && \ rm -rf skaffold && \ diff --git a/docker/tools/Dockerfile_x86 b/docker/tools/Dockerfile_x86 index 8d16217a..f5d10e21 100644 --- a/docker/tools/Dockerfile_x86 +++ b/docker/tools/Dockerfile_x86 @@ -7,7 +7,7 @@ RUN echo '[mongodb-org-4.4]'>/etc/yum.repos.d/mongodb-org-4.0.repo && \ echo 'enabled=1'>>/etc/yum.repos.d/mongodb-org-4.0.repo && \ echo 'gpgkey=https://www.mongodb.org/static/pgp/server-4.4.asc'>>/etc/yum.repos.d/mongodb-org-4.0.repo && \ amazon-linux-extras install postgresql13 -y && \ - yum install mongodb-org-tools mongodb-org-shell tar git mysql bind-utils -y && \ + yum install mongodb-org-tools mongodb-org-shell tar git mysql bind-utils bash-completion -y && \ curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-amd64 && \ install skaffold /usr/local/bin/ && \ rm -rf skaffold && \ From 94e044d16c643c70d6400d1333f6309422e00d26 Mon Sep 17 00:00:00 2001 From: Viktar Mikalayeu Date: Tue, 17 Oct 2023 18:45:26 +0400 Subject: [PATCH 2/3] update docker tools --- docker/tools/Dockerfile_ARM | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/tools/Dockerfile_ARM b/docker/tools/Dockerfile_ARM index f0d092c7..b4fe6285 100644 --- a/docker/tools/Dockerfile_ARM +++ b/docker/tools/Dockerfile_ARM @@ -14,9 +14,6 @@ RUN echo '[mongodb-org-4.4]'>/etc/yum.repos.d/mongodb-org-4.0.repo && \ curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/arm64/kubectl" && \ chmod +x ./kubectl && \ mv kubectl /usr/local/bin/kubectl && \ - curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash && \ - helm plugin install https://github.com/jkroepke/helm-secrets --version v3.8.2 && \ - helm plugin install https://github.com/sstarcher/helm-release && \ curl -L https://raw.githubusercontent.com/warrensbox/terraform-switcher/release/install.sh | bash && \ echo 'source /usr/share/bash-completion/bash_completion'>>~/.bashrc && \ echo 'source <(kubectl completion bash)'>>~/.bashrc && \ @@ -27,3 +24,7 @@ RUN echo '[mongodb-org-4.4]'>/etc/yum.repos.d/mongodb-org-4.0.repo && \ rm -rf /var/cache/yum ENTRYPOINT ["/bin/bash"] + +# curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash && \ +# helm plugin install https://github.com/jkroepke/helm-secrets --version v3.8.2 && \ +# helm plugin install https://github.com/sstarcher/helm-release && \ \ No newline at end of file From 1d3e79660acf0b2e4c509254841cf1efe954cf4b Mon Sep 17 00:00:00 2001 From: Viktar Mikalayeu Date: Tue, 17 Oct 2023 20:16:06 +0400 Subject: [PATCH 3/3] update docker tools --- docker/tools/Dockerfile_ARM | 4 ++++ docker/tools/build.sh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/tools/Dockerfile_ARM b/docker/tools/Dockerfile_ARM index b4fe6285..d58ecad4 100644 --- a/docker/tools/Dockerfile_ARM +++ b/docker/tools/Dockerfile_ARM @@ -15,6 +15,10 @@ RUN echo '[mongodb-org-4.4]'>/etc/yum.repos.d/mongodb-org-4.0.repo && \ chmod +x ./kubectl && \ mv kubectl /usr/local/bin/kubectl && \ curl -L https://raw.githubusercontent.com/warrensbox/terraform-switcher/release/install.sh | bash && \ + wget https://get.helm.sh/helm-v3.13.1-linux-arm.tar.gz && \ + curl -Lo helm.tar.gz https://get.helm.sh/helm-v3.13.1-linux-arm.tar.gz && \ + tar -zxvf helm.tar.gz && \ + mv linux-arm/helm /usr/local/bin/helm && \ echo 'source /usr/share/bash-completion/bash_completion'>>~/.bashrc && \ echo 'source <(kubectl completion bash)'>>~/.bashrc && \ echo 'complete -C "/usr/local/bin/aws_completer" aws'>>~/.bashrc && \ diff --git a/docker/tools/build.sh b/docker/tools/build.sh index fb53f90a..a3cf7bdd 100755 --- a/docker/tools/build.sh +++ b/docker/tools/build.sh @@ -1,8 +1,8 @@ -#docker buildx build --platform linux/arm64 --load -t viktoruj/tools:arm64 -f Dockerfile_ARM . +docker buildx build --platform linux/arm64 --load -t viktoruj/tools:arm64 -f Dockerfile_ARM . docker buildx build --platform linux/amd64 --load -t viktoruj/tools:amd64 -f Dockerfile_x86 . -#docker push viktoruj/tools:arm64 +docker push viktoruj/tools:arm64 docker push viktoruj/tools:amd64 -#docker manifest create viktoruj/tools:latest viktoruj/tools:arm64 viktoruj/tools:amd64 -docker manifest create viktoruj/tools:latest viktoruj/tools:amd64 +docker manifest create viktoruj/tools:latest viktoruj/tools:arm64 viktoruj/tools:amd64 +#docker manifest create viktoruj/tools:latest viktoruj/tools:amd64 docker manifest push viktoruj/tools:latest