worker build improvement + use env after flag for worker generate + g…

…obot

Signed-off-by: greg pereira <[email protected]>

Makefile

@@ -224,9 +224,9 @@ run-on-kind:
 
 .PHONY: docker-clean
 docker-clean:
-	@container_ids=$$(docker ps -a --format "{{.ID}}" | awk '{print $$1}'); \
+	@container_ids=$$(podman ps -a --format "{{.ID}}" | awk '{print $$1}'); \
 	echo "removing all stopped containers (non-force)"; \
     for id in $$container_ids; do \
         echo "Removing container: $$id,"; \
-        docker rm $$id; \
+        podman rm $$id; \
     done

gobot/Containerfile

@@ -1,11 +1,5 @@
 FROM registry.access.redhat.com/ubi8/ubi as build
 
-ARG GITHUB_USER
-ARG GITHUB_TOKEN
-
-ENV GITHUB_USER=$ILWORKER_GITHUB_USERNAME
-ENV GITHUB_TOKEN=$ILWORKER_GITHUB_TOKEN
-
 RUN dnf update -qy && \
     dnf install --setopt=install_weak_deps=False -qy \
     go \

gobot/cmd/root.go

@@ -67,6 +67,12 @@ func init() {
 	rootCmd.PersistentFlags().StringSliceVarP(&Maintainers, "maintainers", "", []string{}, "GitHub users or groups that are considered maintainers")
 	rootCmd.PersistentFlags().BoolVarP(&Debug, "debug", "d", false, "Enable debug logging")
 	rootCmd.PersistentFlags().StringVarP(&BotUsername, "bot-username", "", "@instructlab-bot", "The username of the bot")
+	if GithubToken == "" {
+		GithubToken = os.Getenv("ILWORKER_GITHUB_TOKEN")
+	}
+	if GithubUsername == "" {
+		GithubUsername = os.Getenv("ILWORKER_GITHUB_USERNAME")
+	}
 }
 
 var rootCmd = &cobra.Command{

worker/Containerfile

@@ -1,17 +1,11 @@
 # Stage 1: Build the worker binary
 FROM golang:1.22 as builder
 
-ARG GITHUB_USER
-ARG GITHUB_TOKEN
-
-ENV GITHUB_USER=$ILWORKER_GITHUB_USERNAME
-ENV GITHUB_TOKEN=$ILWORKER_GITHUB_TOKEN
-
 ENV WORK_DIR /app
 
 WORKDIR ${WORK_DIR}
 
-COPY . ${WORK_DIR}/instructlab-bot
+COPY worker ${WORK_DIR}/instructlab-bot/worker
 
 # Build the worker binary
 WORKDIR ${WORK_DIR}/instructlab-bot/worker

worker/cmd/generate.go

@@ -117,7 +117,7 @@ type IlabConfig struct {
 func init() {
 	generateCmd.Flags().StringVarP(&WorkDir, "work-dir", "w", "", "Directory to work in")
 	generateCmd.Flags().StringVarP(&VenvDir, "venv-dir", "v", "", "The virtual environment directory")
-	generateCmd.Flags().StringVarP(&PreCheckEndpointURL, "precheck-endpoint-url", "e", "http://localhost:8000/v1", "Endpoint hosting the model API. Default, it assumes the model is served locally.")
+	generateCmd.Flags().StringVarP(&PreCheckEndpointURL, "precheck-endpoint-url", "e", "", "Endpoint hosting the model API. Default, it assumes the model is served locally.")
 	generateCmd.Flags().StringVarP(&SdgEndpointURL, "sdg-endpoint-url", "", "http://localhost:8000/v1", "Endpoint hosting the model API. Default, it assumes the model is served locally.")
 	generateCmd.Flags().IntVarP(&NumInstructions, "num-instructions", "n", 10, "The number of instructions to generate")
 	generateCmd.Flags().StringVarP(&GitRemote, "git-remote", "", "https://github.com/instructlab/taxonomy", "The git remote for the taxonomy repo")
@@ -131,6 +131,20 @@ func init() {
 	generateCmd.Flags().StringVarP(&TlsServerCaCertPath, "tls-server-ca-cert", "", "server-ca-crt.pem2", "Path to the TLS server CA certificate. Defaults to 'server-ca-crt.pem2'")
 	generateCmd.Flags().BoolVarP(&TlsInsecure, "tls-insecure", "", false, "Whether to skip TLS verification")
 	generateCmd.Flags().IntVarP(&MaxSeed, "max-seed", "m", 40, "Maximum number of seed Q&A pairs to process to SDG.")
+	if GithubToken == "" {
+		GithubToken = os.Getenv("ILWORKER_GITHUB_TOKEN")
+	}
+	if GithubUsername == "" {
+		GithubUsername = os.Getenv("ILWORKER_GITHUB_USERNAME")
+	}
+	if PreCheckEndpointURL == "" {
+		preCheckEndpointURLEnvValue := os.Getenv("PECHECK_ENDPOINT")
+		if preCheckEndpointURLEnvValue != "" {
+			PreCheckEndpointURL = preCheckEndpointURLEnvValue
+		} else {
+			PreCheckEndpointURL = localEndpoint
+		}
+	}
 	_ = generateCmd.MarkFlagRequired("github-token")
 	rootCmd.AddCommand(generateCmd)
 }