images: push to ibm ghcr namespace

aavarghese · starpit · commit 9ddd0fa36d3e · 2024-07-22T10:13:10.000-04:00
Signed-off-by: aavarghese &lt;avarghese@us.ibm.com&gt;

Signed-off-by: aavarghese &lt;avarghese@us.ibm.com&gt;

Signed-off-by: Nick Mitchell &lt;nickm@us.ibm.com&gt;
diff --git a/charts/shell/templates/containers/workdir.yaml b/charts/shell/templates/containers/workdir.yaml
@@ -1,7 +1,7 @@
 {{- define "containers/workdir" }}
 {{- if .Values.workdir.repo }}
 - name: workdir
-  image: {{ print .Values.lunchpail.image.registry "/" .Values.lunchpail.image.repo "/workdir:" .Values.lunchpail.image.version }}
+  image: {{ print .Values.lunchpail.image.registry "/" .Values.lunchpail.image.repo "/lunchpail-workdir:" .Values.lunchpail.image.version }}
   volumeMounts:
     {{ include "workdir/volumeMount" . | indent 4 }}
   env:
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -7,5 +7,5 @@ gpu-operator:
 # these values may be overriden by hack/up.sh
 image:
   registry: ghcr.io
-  repo: lunchpail
+  repo: ibm
   version: 0.0.1
diff --git a/charts/workerpool/templates/containers/watcher.yaml b/charts/workerpool/templates/containers/watcher.yaml
@@ -1,6 +1,6 @@
 {{- define "containers/watcher" }}
 - name: watcher
-  image: {{ print .Values.watcher.image.registry "/" .Values.lunchpail "/worker-watcher:" .Values.watcher.image.version }}
+  image: {{ print .Values.watcher.image.registry "/" .Values.watcher.image.repo "/lunchpail-worker-watcher:" .Values.watcher.image.version }}
   volumeMounts:
     {{ include "workdir/volumeMount" . | indent 4 }}
   command:
diff --git a/charts/workerpool/templates/containers/workdir.yaml b/charts/workerpool/templates/containers/workdir.yaml
@@ -1,7 +1,7 @@
 {{- define "containers/workdir" }}
 {{- if .Values.workdir.repo }}
 - name: workdir
-  image: {{ print .Values.watcher.image.registry "/" .Values.watcher.image.repo "/workdir:" .Values.watcher.image.version }}
+  image: {{ print .Values.watcher.image.registry "/" .Values.watcher.image.repo "/lunchpail-workdir:" .Values.watcher.image.version }}
   volumeMounts:
     {{ include "workdir/volumeMount" . | indent 4 }}
   env:
diff --git a/charts/workstealer/templates/containers/workstealer.yaml b/charts/workstealer/templates/containers/workstealer.yaml
@@ -1,6 +1,6 @@
 {{- define "containers/workstealer" }}
 - name: workstealer
-  image: {{ print .Values.image.registry "/" .Values.image.repo "/workstealer:" .Values.image.version }}
+  image: {{ print .Values.image.registry "/" .Values.image.repo "/lunchpail-workstealer:" .Values.image.version }}
   command: ["/opt/lunchpail/workstealer/scripts/workstealer.sh"]
   volumeMounts:
     {{- include "scripts/volumeMount" . | indent 4 }}
diff --git a/images/base-images/ai/README.md b/images/base-images/ai/README.md
diff --git a/images/base-images/fastparquet/README.md b/images/base-images/fastparquet/README.md
diff --git a/images/base-images/lunchpail-ai/Dockerfile b/images/base-images/lunchpail-ai/Dockerfile
@@ -1,4 +1,5 @@
 FROM docker.io/python:3.12-slim
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 
 RUN apt update && apt install -y bc && apt autoremove -y && apt clean && rm -rf ~/.cache && rm -rf /var/lib/apt/lists/* && \
     pip install --no-cache-dir \
diff --git a/images/base-images/lunchpail-ai/README.md b/images/base-images/lunchpail-ai/README.md
@@ -0,0 +1,15 @@
+For example:
+
+```shell
+podman manifest create ghcr.io/ibm/lunchpail-ai:0.0.4
+podman build \
+    --platform=linux/arm64/v8,linux/amd64 \
+        --manifest ghcr.io/ibm/lunchpail-ai:0.0.4 .
+```
+
+Then, to push:
+
+```shell
+podman manifest push ghcr.io/ibm/lunchpail-ai:0.0.4
+```
+
diff --git a/images/base-images/lunchpail-fastparquet/Dockerfile b/images/base-images/lunchpail-fastparquet/Dockerfile
@@ -1,4 +1,5 @@
 FROM docker.io/alpine:3
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 
 # RUN apk add --no-cache maven curl build-base openjdk11 && \
 #     cd /tmp && \
diff --git a/images/base-images/lunchpail-fastparquet/README.md b/images/base-images/lunchpail-fastparquet/README.md
@@ -0,0 +1,15 @@
+For example:
+
+```shell
+podman manifest create ghcr.io/ibm/lunchpail-fastparquet:0.0.1
+podman build \
+    --platform=linux/arm64/v8,linux/amd64 \
+        --manifest ghcr.io/ibm/lunchpail-fastparquet:0.0.1 .
+```
+
+Then, to push:
+
+```shell
+podman manifest push ghcr.io/ibm/lunchpail-fastparquet:0.0.1
+```
+
diff --git a/images/base-images/lunchpail-rclone/Dockerfile b/images/base-images/lunchpail-rclone/Dockerfile
@@ -1,4 +1,5 @@
 FROM alpine:3
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 
 RUN ARCH=$(uname -m); if [ $ARCH = "x86_64" ]; then TARGETARCH=amd64; else TARGETARCH=arm64; fi ; \
     apk update && apk add --no-cache bash && \
diff --git a/images/base-images/lunchpail-rclone/README.md b/images/base-images/lunchpail-rclone/README.md
@@ -0,0 +1,15 @@
+For example:
+
+```shell
+podman manifest create ghcr.io/ibm/lunchpail-rclone:0.0.1
+podman build \
+    --platform=linux/arm64/v8,linux/amd64 \
+        --manifest ghcr.io/ibm/lunchpail-rclone:0.0.1 .
+```
+
+Then, to push:
+
+```shell
+podman manifest push ghcr.io/ibm/lunchpail-rclone:0.0.1
+```
+
diff --git a/images/base-images/rclone/README.md b/images/base-images/rclone/README.md
diff --git a/images/components/lunchpail-tasksimulator-parquet/.gitignore b/images/components/lunchpail-tasksimulator-parquet/.gitignore
diff --git a/images/components/lunchpail-tasksimulator-parquet/Dockerfile b/images/components/lunchpail-tasksimulator-parquet/Dockerfile
@@ -1,4 +1,5 @@
-FROM ghcr.io/lunchpail/fastparquet:0.0.1
+FROM ghcr.io/ibm/lunchpail-fastparquet:0.0.1
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 
 COPY --chmod=755 main.sh /opt/lunchpail/bin/main.sh
 
diff --git a/images/components/lunchpail-tasksimulator-parquet/main.sh b/images/components/lunchpail-tasksimulator-parquet/main.sh
diff --git a/images/components/lunchpail-workdir/Dockerfile b/images/components/lunchpail-workdir/Dockerfile
@@ -1,4 +1,5 @@
 FROM alpine:3
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 
 RUN apk update && apk add --no-cache git ca-certificates bash
 ADD clone.sh /opt/lunchpail/bin/clone.sh
diff --git a/images/components/lunchpail-workdir/clone.sh b/images/components/lunchpail-workdir/clone.sh
diff --git a/images/components/lunchpail-worker-alpine/Dockerfile b/images/components/lunchpail-worker-alpine/Dockerfile
@@ -1,4 +1,5 @@
 FROM docker.io/alpine:3
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 
 # Note: watcher.sh depends on some bash-isms at the moment
 RUN apk update && \
diff --git a/images/components/lunchpail-worker-alpine/README.md b/images/components/lunchpail-worker-alpine/README.md
diff --git a/images/components/lunchpail-worker-alpine/sysctl.conf b/images/components/lunchpail-worker-alpine/sysctl.conf
diff --git a/images/components/lunchpail-worker-python-alpine/Dockerfile b/images/components/lunchpail-worker-python-alpine/Dockerfile
@@ -1,4 +1,5 @@
 FROM docker.io/alpine:3
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 
 # Note: watcher.sh depends on some bash-isms at the moment
 RUN apk update && \
diff --git a/images/components/lunchpail-worker-watcher/Dockerfile b/images/components/lunchpail-worker-watcher/Dockerfile
@@ -1,4 +1,5 @@
 FROM docker.io/golang:1.22.1-alpine
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 WORKDIR /init
 
 COPY go.* .
diff --git a/images/components/lunchpail-worker-watcher/go.mod b/images/components/lunchpail-worker-watcher/go.mod
diff --git a/images/components/lunchpail-worker-watcher/go.sum b/images/components/lunchpail-worker-watcher/go.sum
diff --git a/images/components/lunchpail-worker-watcher/main.go b/images/components/lunchpail-worker-watcher/main.go
diff --git a/images/components/lunchpail-workstealer/Dockerfile b/images/components/lunchpail-workstealer/Dockerfile
@@ -1,5 +1,6 @@
 # Build stage
 FROM docker.io/golang:1.22.1-alpine
+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"
 WORKDIR /workstealer
 
 COPY go.* ./
diff --git a/images/components/lunchpail-workstealer/README.md b/images/components/lunchpail-workstealer/README.md
diff --git a/images/components/lunchpail-workstealer/go.mod b/images/components/lunchpail-workstealer/go.mod
diff --git a/images/components/lunchpail-workstealer/go.sum b/images/components/lunchpail-workstealer/go.sum
diff --git a/images/components/lunchpail-workstealer/main.go b/images/components/lunchpail-workstealer/main.go
diff --git a/pkg/fe/transformer/api/dispatch/parametersweep/transpile.go b/pkg/fe/transformer/api/dispatch/parametersweep/transpile.go
@@ -13,7 +13,7 @@ func transpile(sweep hlir.ParameterSweep) (hlir.Application, error) {
 	app.ApiVersion = sweep.ApiVersion
 	app.Kind = "Application"
 	app.Metadata.Name = sweep.Metadata.Name
-	app.Spec.Image = fmt.Sprintf("%s/%s/rclone:0.0.1", lunchpail.ImageRegistry, lunchpail.ImageRepo)
+	app.Spec.Image = fmt.Sprintf("%s/%s/lunchpail-rclone:0.0.1", lunchpail.ImageRegistry, lunchpail.ImageRepo)
 	app.Spec.Api = "shell"
 	app.Spec.Role = "dispatcher"
 	app.Spec.Command = "./main.sh"
diff --git a/pkg/fe/transformer/api/dispatch/s3/transpile.go b/pkg/fe/transformer/api/dispatch/s3/transpile.go
@@ -21,7 +21,7 @@ func transpile(s3 hlir.ProcessS3Objects) (hlir.Application, error) {
 	app.ApiVersion = s3.ApiVersion
 	app.Kind = "Application"
 	app.Metadata.Name = s3.Metadata.Name
-	app.Spec.Image = fmt.Sprintf("%s/%s/rclone:0.0.1", lunchpail.ImageRegistry, lunchpail.ImageRepo)
+	app.Spec.Image = fmt.Sprintf("%s/%s/lunchpail-rclone:0.0.1", lunchpail.ImageRegistry, lunchpail.ImageRepo)
 	app.Spec.Api = "shell"
 	app.Spec.Role = "dispatcher"
 	app.Spec.Command = "./main.sh"
diff --git a/pkg/lunchpail/settings.go b/pkg/lunchpail/settings.go
@@ -2,6 +2,6 @@ package lunchpail
 
 const (
 	ImageRegistry    = "ghcr.io"
-	ImageRepo        = "lunchpail"
+	ImageRepo        = "ibm"
 	LocalClusterName = "lunchpail"
 )
diff --git a/tests/tests/test7/pail/app.yaml b/tests/tests/test7/pail/app.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   api: workqueue
   role: worker
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
   code:
     - name: main.sh
       source: |
diff --git a/tests/tests/test7b/pail/app.yaml b/tests/tests/test7b/pail/app.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   api: workqueue
   role: worker
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
   code:
     - name: main.sh
       source: |
diff --git a/tests/tests/test7c/pail/app.yaml b/tests/tests/test7c/pail/app.yaml
@@ -23,7 +23,7 @@ spec:
         echo "Done with $in"
 
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
   env:
     MESSAGE: {{ .Values.message | default "BUG" }}
 # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap
diff --git a/tests/tests/test7d/pail/app.yaml b/tests/tests/test7d/pail/app.yaml
@@ -22,5 +22,5 @@ spec:
         echo "Done with $in"
 
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
 {{- end }}
diff --git a/tests/tests/test7e-by-role-autorun/pail/app.yaml b/tests/tests/test7e-by-role-autorun/pail/app.yaml
@@ -21,7 +21,7 @@ spec:
 
   role: worker
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
 
 # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap
 #  inputs:
diff --git a/tests/tests/test7e-by-role/pail/app.yaml b/tests/tests/test7e-by-role/pail/app.yaml
@@ -22,7 +22,7 @@ spec:
 
   role: worker
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
 
 # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap
 #  inputs:
diff --git a/tests/tests/test7e/pail/app.yaml b/tests/tests/test7e/pail/app.yaml
@@ -28,7 +28,7 @@ spec:
         echo "Done with $in"
 
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
 
 # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap
 #  inputs:
diff --git a/tests/tests/test7f-by-role-autorun-autodispatcher/pail/logic/worker.yaml b/tests/tests/test7f-by-role-autorun-autodispatcher/pail/logic/worker.yaml
@@ -21,4 +21,4 @@ spec:
         echo "Done with $in"
 
   command: ./literal.sh
-  image: {{ print .Values.image.registry "/" .Values.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.image.registry "/" .Values.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
diff --git a/tests/tests/test7f-external/settings.sh b/tests/tests/test7f-external/settings.sh
@@ -1,6 +1,6 @@
 api=workqueue
 app=https://github.com/IBM/lunchpail-demo.git
-branch=v0.0.15
+branch=v0.1.0
 deployname=lunchpail-demo
 
 # /queue/0,1 <-- 2 workers
diff --git a/tests/tests/test7f-repo/pail/app.yaml b/tests/tests/test7f-repo/pail/app.yaml
@@ -7,6 +7,6 @@ spec:
   role: worker
   repo: https://github.com/IBM/lunchpail/tree/main/tests/tests/test7f-repo/pail
   command: ./src/main.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
   env:
     WORK_TIME: {{ .Values.duration | default 5 | quote }}
diff --git a/tests/tests/test7f/pail/worker.yaml b/tests/tests/test7f/pail/worker.yaml
@@ -23,6 +23,6 @@ spec:
         echo "Done with $in"
 
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
   env:
     WORK_TIME: {{ .Values.duration | default 5 | quote }}
diff --git a/tests/tests/test7g/pail/app.yaml b/tests/tests/test7g/pail/app.yaml
@@ -22,5 +22,5 @@ spec:
         echo "Done with $in"
 
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
 {{- end }}
diff --git a/tests/tests/test7g/pail/workdispatcher-app.yaml b/tests/tests/test7g/pail/workdispatcher-app.yaml
@@ -30,7 +30,7 @@ spec:
       sleep 10000
 
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
   env:
     # main.sh from workdispatcher1 uses $taskprefix and $taskprefix2; this overrides an env var from ./workdispatcher-app.yaml
     taskprefix: tasky
diff --git a/tests/tests/test7h/pail/app.yaml b/tests/tests/test7h/pail/app.yaml
@@ -22,7 +22,7 @@ spec:
         echo "Done with $in"
 
   command: ./literal.sh
-  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }}
+  image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }}
 
 # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap
 #  inputs:
diff --git a/tests/tests/test8/settings.sh b/tests/tests/test8/settings.sh
@@ -1,6 +1,6 @@
 api=workqueue
 app=https://github.com/IBM/lunchpail-openroad-max-utilization.git
-branch=v0.1.0
+branch=v0.2.0
 deployname=lunchpail-openroad-max-utilization
 
 # we kill the process before it is finishes
diff --git a/tests/tests/test8b/settings.sh b/tests/tests/test8b/settings.sh
@@ -1,6 +1,6 @@
 api=workqueue
 app=https://github.com/IBM/lunchpail-openroad-max-utilization.git
-branch=v0.1.0
+branch=v0.2.0
 deployname=lunchpail-openroad-max-utilization
 
 # we kill the process before it is finishes

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`FROM docker.io/python:3.12-slim`
	`2`	`+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"`
`2`	`3`
`3`	`4`	`RUN apt update && apt install -y bc && apt autoremove -y && apt clean && rm -rf ~/.cache && rm -rf /var/lib/apt/lists/* && \`
`4`	`5`	`pip install --no-cache-dir \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`FROM docker.io/alpine:3`
	`2`	`+LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail"`
`2`	`3`
`3`	`4`	`# RUN apk add --no-cache maven curl build-base openjdk11 && \`
`4`	`5`	`# cd /tmp && \`