diff --git a/.github/workflows/publishDockerImage.yml b/.github/workflows/publishDockerImage.yml index 7aee3eb..bdaaa96 100644 --- a/.github/workflows/publishDockerImage.yml +++ b/.github/workflows/publishDockerImage.yml @@ -32,6 +32,4 @@ jobs: context: . push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: - TF_VERSION=1.1.2 + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 8c0b36c..a619a3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Prep base stage -ARG TF_VERSION=light +ARG TF_VERSION=1.5.5 # Build ui FROM node:20-alpine as ui @@ -30,8 +30,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o rover . # Release stage FROM hashicorp/terraform:$TF_VERSION AS release -# Copy terraform binary to the rover's default terraform path -RUN cp /bin/terraform /usr/local/bin/terraform + # Copy rover binary COPY --from=rover /src/rover /bin/rover RUN chmod +x /bin/rover diff --git a/main.go b/main.go index ccf5957..34c60e6 100644 --- a/main.go +++ b/main.go @@ -69,7 +69,7 @@ func main() { var tfPath, workingDir, name, zipFileName, ipPort, planPath, planJSONPath, workspaceName, tfcOrgName, tfcWorkspaceName string var standalone, genImage, showSensitive, getVersion, tfcNewRun bool var tfVarsFiles, tfVars, tfBackendConfigs arrayFlags - flag.StringVar(&tfPath, "tfPath", "/usr/local/bin/terraform", "Path to Terraform binary") + flag.StringVar(&tfPath, "tfPath", "/bin/terraform", "Path to Terraform binary") flag.StringVar(&workingDir, "workingDir", ".", "Path to Terraform configuration") flag.StringVar(&name, "name", "rover", "Configuration name") flag.StringVar(&zipFileName, "zipFileName", "rover", "Standalone zip file name")