Merge pull request #13 from datastack-net/feature/rust

Feature/rust

Author: boukeversteegh

.env

@@ -23,6 +23,7 @@ PROTOC_BASE=${DEFAULT_BASE}
 PYTHON_VERSION=3.10
 PYTHON2_VERSION=2.7.18
 RUBY_VERSION=3.1.1
+RUST_VERSION=1.59.0
 S3CMD_BASE=python:${PYTHON_VERSION}-${DEFAULT_BASE_IMAGE}
 S3CMD_VERSION=2.2.0
 SWAGGER_CODEGEN_VERSION=3.0.29

.github/workflows/test.yml

@@ -12,6 +12,8 @@ jobs:
           - go
           - aws
           - python
+          - rustc
+          - zip
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Dockerized

README.md

@@ -45,8 +45,10 @@ dockerized <command>
     - python
     - python2
   - ruby
+  - rustc (rust compiler)
 - Unix
   - tree
+  - zip
 
 
 ## Installation

docker-compose.yml

@@ -134,9 +134,9 @@ services:
   ruby:
     image: "ruby:${RUBY_VERSION}"
     entrypoint: [ "ruby" ]
-#  rustc:
-#    image: "rust:${RUST_VERSION}"
-#    entrypoint: [ "rustc" ]
+  rustc:
+    image: "rust:${RUST_VERSION}"
+    entrypoint: [ "rustc" ]
   s3cmd:
     build:
       context: apps/s3cmd

lib/dockerized.go

@@ -145,9 +145,21 @@ func main() {
 		}
 		welcomeMessage = strings.ReplaceAll(welcomeMessage, "\\", "\\\\")
 
-		preferredShells := "bash zsh sh"
+		shells := []string{
+			"bash",
+			"zsh",
+			"sh",
+		}
+		var shellDetectionCommands []string
+		for _, shell := range shells {
+			shellDetectionCommands = append(shellDetectionCommands, "command -v "+shell)
+		}
+		for _, shell := range shells {
+			shellDetectionCommands = append(shellDetectionCommands, "which "+shell)
+		}
+
 		var cmdPrintWelcome = fmt.Sprintf("echo '%s'", color.YellowString(welcomeMessage))
-		var cmdLaunchShell = fmt.Sprintf("$(command -v %[1]s | head -n1 || which %[1]s | head -n1)", preferredShells)
+		var cmdLaunchShell = fmt.Sprintf("$(%s)", strings.Join(shellDetectionCommands, " || "))
 
 		runOptions.Environment = append(runOptions.Environment, "PS1="+ps1)
 		runOptions.Entrypoint = []string{"/bin/sh"}