Add ArchMatcher

shiv3 · Jul 29, 2021 · 31e8636 · 31e8636
1 parent 5fe1d54
commit 31e8636
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/domain/installer/installer.go b/domain/installer/installer.go
@@ -16,7 +16,12 @@ func NewInstaller(installType InstallType, installConfig InstallConfig) Installe
 	case InstallTypeGoInstall:
 		return NewInstallerGoInstall(InstallTypeGoInstall, installConfig)
 	case InstallTypeGitHubReleaseZip:
-		return NewInstallerGithubReleaseZip(InstallTypeGitHubReleaseZip, installConfig)
+		return NewInstallerGithubReleaseZip(InstallTypeGitHubReleaseZip, installConfig, map[string]string{
+			"darwin/386":   "osx-x86_64",
+			"darwin/amd64": "osx-x86_64",
+			"linux/386":    "linux-x86_32",
+			"linux/amd64":  "linux-x86_64",
+		})
 	}
 	return nil
 }

diff --git a/domain/installer/installer_github_release.go b/domain/installer/installer_github_release.go
@@ -18,8 +18,8 @@ type InstallerGithubReleaseZip struct {
 	ArchMatcher   map[string]string
 }
 
-func NewInstallerGithubReleaseZip(installType InstallType, installConfig InstallConfig) *InstallerGithubReleaseZip {
-	return &InstallerGithubReleaseZip{InstallType: installType, InstallConfig: installConfig}
+func NewInstallerGithubReleaseZip(installType InstallType, installConfig InstallConfig, archMatcher map[string]string) *InstallerGithubReleaseZip {
+	return &InstallerGithubReleaseZip{InstallType: installType, InstallConfig: installConfig, ArchMatcher: archMatcher}
 }
 
 func (i *InstallerGithubReleaseZip) Install(ctx context.Context, options ...InstallOption) error {

diff --git a/example/Dockerfile b/example/Dockerfile
@@ -1,7 +1,9 @@
 FROM golang:1.16
 
-WORKDIR /
-RUN go install github.com/shiv3/protoenv@latest
+WORKDIR /root
+RUN go install github.com/shiv3/protoenv@v0.0.2
 
+RUN mkdir -p .protoenv/protoc
+RUN protoenv protoc init
 RUN protoenv protoc install v3.17.3
-RUN protoenv plugins protoc-gen-go install v1.20.0
+RUN protoenv plugins protoc-gen-go install v1.26