From 84ac2f19c1e83561511012bc6982092ec17388f7 Mon Sep 17 00:00:00 2001
From: Tosone <guoyaning.guoyn@bytedance.com>
Date: Wed, 27 Sep 2023 16:23:20 +0800
Subject: [PATCH] feat: update vim, openssl

---
 hack/openssl/Dockerfile                       |  2 +-
 hack/openssl/build.sh                         | 25 ++++++++++++-------
 hack/redis/build.sh                           |  1 +
 hack/vim/Dockerfile                           |  2 +-
 hack/vim/build.sh                             | 25 ++++++++++++-------
 .../addons/openssl/openssl_linux_amd64.go     | 10 ++++----
 .../addons/openssl/openssl_linux_arm64.go     | 10 ++++----
 internal/addons/vim/vim_linux_amd64.go        | 10 ++++----
 internal/addons/vim/vim_linux_arm64.go        | 10 ++++----
 9 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/hack/openssl/Dockerfile b/hack/openssl/Dockerfile
index 98ed9852..cb0ed6ab 100644
--- a/hack/openssl/Dockerfile
+++ b/hack/openssl/Dockerfile
@@ -1,4 +1,4 @@
-FROM vecps:base-v0.1.1
+FROM vecps:base-v0.1.2
 
 LABEL maintainer="Tosone <i@tosone.cn>"
 
diff --git a/hack/openssl/build.sh b/hack/openssl/build.sh
index e6cf7698..7ed693a7 100755
--- a/hack/openssl/build.sh
+++ b/hack/openssl/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=3.1.0
+version=3.1.3
 
 clean_up () {
   if [ -d openssl ]; then
@@ -8,19 +8,26 @@ clean_up () {
   fi
 }
 
-docker build -t vecps:openssl-v0.1.0 --build-arg OPENSSL_VERSION=${version} .
+osArr=("linux" "linux")
+archArr=("amd64" "arm64")
+length=${#osArr[@]}
 
-clean_up
+for ((i=0; i<length; i++)); do
+  docker build --platform "${osArr[i]}"/"${archArr[i]}" -t vecps:base-v0.1.2 -f ../base/Dockerfile ../base
+  docker build --platform "${osArr[i]}"/"${archArr[i]}" -t vecps:openssl-v0.1.0 --build-arg OPENSSL_VERSION=${version} .
 
-docker run -i --rm -v "$PWD":/out vecps:openssl-v0.1.0 /bin/sh <<EOF
+  clean_up
+
+  docker run -i --rm -v "$PWD":/out vecps:openssl-v0.1.0 /bin/sh <<EOF
 mkdir -p /out/openssl
 cp -r /app/openssl/bin /out/openssl
 EOF
 
-sudo chown -R "$(id -u)":"$(id -g)" openssl
+  sudo chown -R "$(id -u)":"$(id -g)" openssl
 
-target=openssl-$(uname -s | tr "[:upper:]" "[:lower:]")-$(dpkg --print-architecture)-${version}.tar.gz
-tar zcf "${target}" openssl
-sha256sum "${target}" > "${target}".sha256
+  target=openssl-"${osArr[i]}"-"${archArr[i]}"-${version}.tar.gz
+  tar zcf "${target}" openssl
+  shasum -a 256 "${target}" > "${target}".sha256
 
-clean_up
+  clean_up
+done
diff --git a/hack/redis/build.sh b/hack/redis/build.sh
index 617d91c2..3ef93d40 100755
--- a/hack/redis/build.sh
+++ b/hack/redis/build.sh
@@ -7,6 +7,7 @@ clean_up () {
     rm -rf redis
   fi
 }
+
 osArr=("linux" "linux")
 archArr=("amd64" "arm64")
 length=${#osArr[@]}
diff --git a/hack/vim/Dockerfile b/hack/vim/Dockerfile
index 3c9f1ab0..53edbdac 100644
--- a/hack/vim/Dockerfile
+++ b/hack/vim/Dockerfile
@@ -1,4 +1,4 @@
-FROM vecps:base-v0.1.1
+FROM vecps:base-v0.1.2
 
 LABEL maintainer="Tosone <i@tosone.cn>"
 
diff --git a/hack/vim/build.sh b/hack/vim/build.sh
index c41fdf04..83401fb0 100755
--- a/hack/vim/build.sh
+++ b/hack/vim/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=9.0.1501
+version=9.0.1943
 
 clean_up () {
   if [ -d vim ]; then
@@ -8,19 +8,26 @@ clean_up () {
   fi
 }
 
-docker build -t vecps:vim-v0.1.0 --build-arg VIM_VERSION=${version} .
+osArr=("linux" "linux")
+archArr=("amd64" "arm64")
+length=${#osArr[@]}
 
-clean_up
+for ((i=0; i<length; i++)); do
+  docker build --platform "${osArr[i]}"/"${archArr[i]}" -t vecps:base-v0.1.2 -f ../base/Dockerfile ../base
+  docker build --platform "${osArr[i]}"/"${archArr[i]}" -t vecps:vim-v0.1.0 --build-arg VIM_VERSION=${version} .
 
-docker run -i --rm -v "$PWD":/out vecps:vim-v0.1.0 /bin/sh <<EOF
+  clean_up
+
+  docker run -i --rm -v "$PWD":/out vecps:vim-v0.1.0 /bin/sh <<EOF
 mkdir -p /out
 cp -r /app/vim /out/
 EOF
 
-sudo chown -R "$(id -u)":"$(id -g)" vim
+  sudo chown -R "$(id -u)":"$(id -g)" vim
 
-target=vim-$(uname -s | tr "[:upper:]" "[:lower:]")-$(dpkg --print-architecture)-${version}.tar.gz
-tar zcf "${target}" vim
-sha256sum "${target}" > "${target}".sha256
+  target=vim-"${osArr[i]}"-"${archArr[i]}"-${version}.tar.gz
+  tar zcf "${target}" vim
+  shasum -a 256 "${target}" > "${target}".sha256
 
-clean_up
+  clean_up
+done
diff --git a/internal/addons/openssl/openssl_linux_amd64.go b/internal/addons/openssl/openssl_linux_amd64.go
index 406241dc..66cfbabb 100644
--- a/internal/addons/openssl/openssl_linux_amd64.go
+++ b/internal/addons/openssl/openssl_linux_amd64.go
@@ -7,18 +7,18 @@ import (
 	"code.byted.org/infcp/vecps-cli/pkg/util"
 )
 
-//go:generate wget -c -q -O openssl-linux-amd64-3.1.1.tar.gz https://fs.tosone.cn/vecps-cli/addons/openssl/openssl-linux-amd64-3.1.1.tar.gz
-//go:generate wget -c -q -O openssl-linux-amd64-3.1.1.tar.gz.sha256 https://fs.tosone.cn/vecps-cli/addons/openssl/openssl-linux-amd64-3.1.1.tar.gz.sha256
-//go:generate shasum -a 256 -c openssl-linux-amd64-3.1.1.tar.gz.sha256
+//go:generate wget -c -q -O openssl-linux-amd64-3.1.3.tar.gz https://fs.tosone.cn/vecps-cli/addons/openssl/openssl-linux-amd64-3.1.3.tar.gz
+//go:generate wget -c -q -O openssl-linux-amd64-3.1.3.tar.gz.sha256 https://fs.tosone.cn/vecps-cli/addons/openssl/openssl-linux-amd64-3.1.3.tar.gz.sha256
+//go:generate shasum -a 256 -c openssl-linux-amd64-3.1.3.tar.gz.sha256
 
-//go:embed openssl-linux-amd64-3.1.1.tar.gz
+//go:embed openssl-linux-amd64-3.1.3.tar.gz
 var data embed.FS
 
 // Initialize ...
 func Initialize() (err error) {
 	var archive = &util.Archive{
 		EmbedFile: data,
-		Filename:  "openssl-linux-amd64-3.1.1.tar.gz",
+		Filename:  "openssl-linux-amd64-3.1.3.tar.gz",
 		Core:      "openssl/",
 	}
 	if err = archive.Dump(); err != nil {
diff --git a/internal/addons/openssl/openssl_linux_arm64.go b/internal/addons/openssl/openssl_linux_arm64.go
index 7b053d37..f5f67344 100644
--- a/internal/addons/openssl/openssl_linux_arm64.go
+++ b/internal/addons/openssl/openssl_linux_arm64.go
@@ -7,18 +7,18 @@ import (
 	"code.byted.org/infcp/vecps-cli/pkg/util"
 )
 
-//go:generate wget -c -q -O openssl-linux-arm64-3.1.1.tar.gz https://fs.tosone.cn/vecps-cli/addons/openssl/openssl-linux-arm64-3.1.1.tar.gz
-//go:generate wget -c -q -O openssl-linux-arm64-3.1.1.tar.gz.sha256 https://fs.tosone.cn/vecps-cli/addons/openssl/openssl-linux-arm64-3.1.1.tar.gz.sha256
-//go:generate shasum -a 256 -c openssl-linux-arm64-3.1.1.tar.gz.sha256
+//go:generate wget -c -q -O openssl-linux-arm64-3.1.3.tar.gz https://fs.tosone.cn/vecps-cli/addons/openssl/openssl-linux-arm64-3.1.3.tar.gz
+//go:generate wget -c -q -O openssl-linux-arm64-3.1.3.tar.gz.sha256 https://fs.tosone.cn/vecps-cli/addons/openssl/openssl-linux-arm64-3.1.3.tar.gz.sha256
+//go:generate shasum -a 256 -c openssl-linux-arm64-3.1.3.tar.gz.sha256
 
-//go:embed openssl-linux-arm64-3.1.1.tar.gz
+//go:embed openssl-linux-arm64-3.1.3.tar.gz
 var data embed.FS
 
 // Initialize ...
 func Initialize() (err error) {
 	var archive = &util.Archive{
 		EmbedFile: data,
-		Filename:  "openssl-linux-arm64-3.1.1.tar.gz",
+		Filename:  "openssl-linux-arm64-3.1.3.tar.gz",
 		Core:      "openssl/",
 	}
 	if err = archive.Dump(); err != nil {
diff --git a/internal/addons/vim/vim_linux_amd64.go b/internal/addons/vim/vim_linux_amd64.go
index dbb52ddf..9f519f69 100644
--- a/internal/addons/vim/vim_linux_amd64.go
+++ b/internal/addons/vim/vim_linux_amd64.go
@@ -7,18 +7,18 @@ import (
 	"code.byted.org/infcp/vecps-cli/pkg/util"
 )
 
-//go:generate wget -c -q -O vim-linux-amd64-9.0.1501.tar.gz https://fs.tosone.cn/vecps-cli/addons/vim/vim-linux-amd64-9.0.1501.tar.gz
-//go:generate wget -c -q -O vim-linux-amd64-9.0.1501.tar.gz.sha256 https://fs.tosone.cn/vecps-cli/addons/vim/vim-linux-amd64-9.0.1501.tar.gz.sha256
-//go:generate shasum -a 256 -c vim-linux-amd64-9.0.1501.tar.gz.sha256
+//go:generate wget -c -q -O vim-linux-amd64-9.0.1943.tar.gz https://fs.tosone.cn/vecps-cli/addons/vim/vim-linux-amd64-9.0.1943.tar.gz
+//go:generate wget -c -q -O vim-linux-amd64-9.0.1943.tar.gz.sha256 https://fs.tosone.cn/vecps-cli/addons/vim/vim-linux-amd64-9.0.1943.tar.gz.sha256
+//go:generate shasum -a 256 -c vim-linux-amd64-9.0.1943.tar.gz.sha256
 
-//go:embed vim-linux-amd64-9.0.1501.tar.gz
+//go:embed vim-linux-amd64-9.0.1943.tar.gz
 var data embed.FS
 
 // Initialize ...
 func Initialize() (err error) {
 	var archive = &util.Archive{
 		EmbedFile: data,
-		Filename:  "vim-linux-amd64-9.0.1501.tar.gz",
+		Filename:  "vim-linux-amd64-9.0.1943.tar.gz",
 		Core:      "vim/",
 	}
 	err = archive.Dump()
diff --git a/internal/addons/vim/vim_linux_arm64.go b/internal/addons/vim/vim_linux_arm64.go
index 2c9b92ac..1f7c885d 100644
--- a/internal/addons/vim/vim_linux_arm64.go
+++ b/internal/addons/vim/vim_linux_arm64.go
@@ -7,18 +7,18 @@ import (
 	"code.byted.org/infcp/vecps-cli/pkg/util"
 )
 
-//go:generate wget  -q -O vim-linux-arm64-9.0.1501.tar.gz https://fs.tosone.cn/vecps-cli/addons/vim/vim-linux-arm64-9.0.1501.tar.gz
-//go:generate wget  -q -O vim-linux-arm64-9.0.1501.tar.gz.sha256 https://fs.tosone.cn/vecps-cli/addons/vim/vim-linux-arm64-9.0.1501.tar.gz.sha256
-//go:generate shasum -a 256 -c vim-linux-arm64-9.0.1501.tar.gz.sha256
+//go:generate wget  -q -O vim-linux-arm64-9.0.1943.tar.gz https://fs.tosone.cn/vecps-cli/addons/vim/vim-linux-arm64-9.0.1943.tar.gz
+//go:generate wget  -q -O vim-linux-arm64-9.0.1943.tar.gz.sha256 https://fs.tosone.cn/vecps-cli/addons/vim/vim-linux-arm64-9.0.1943.tar.gz.sha256
+//go:generate shasum -a 256 -c vim-linux-arm64-9.0.1943.tar.gz.sha256
 
-//go:embed vim-linux-arm64-9.0.1501.tar.gz
+//go:embed vim-linux-arm64-9.0.1943.tar.gz
 var data embed.FS
 
 // Initialize ...
 func Initialize() (err error) {
 	var archive = &util.Archive{
 		EmbedFile: data,
-		Filename:  "vim-linux-arm64-9.0.1501.tar.gz",
+		Filename:  "vim-linux-arm64-9.0.1943.tar.gz",
 		Core:      "vim/",
 	}
 	err = archive.Dump()