Merge pull request #1 from nmaguiar/improve-usability

Improve usability
nmaguiar · Jul 8, 2024 · 5d2560f · 5d2560f
2 parents 70b0ee6 + ba21f1b
commit 5d2560f
Show file tree

Hide file tree

Showing 7 changed files with 544 additions and 12 deletions.
diff --git a/.github/ojobs/getVersions.yaml b/.github/ojobs/getVersions.yaml
@@ -36,6 +36,8 @@ jobs:
               .sh(["docker", "run", "--rm", "nmaguiar/imgutils:" + args.tag, "/bin/sh", "-c", `helm version | /openaf/oafp path=Version`])
               .sh(["docker", "run", "--rm", "nmaguiar/imgutils:" + args.tag, "/bin/sh", "-c", `skopeo -v | /openaf/oafp path="split(@, ' ')[2]"`])
               .sh(["docker", "run", "--rm", "nmaguiar/imgutils:" + args.tag, "/bin/sh", "-c", `crictl -v | /openaf/oafp path="split(@, ' ')[2]"`])
+              .sh(["docker", "run", "--rm", "nmaguiar/imgutils:" + args.tag, "/bin/sh", "-c", `ctr -v | /openaf/oafp path="replace(split(@, ' ')[2],'v','','')"`])
+              .sh(["docker", "run", "--rm", "nmaguiar/imgutils:" + args.tag, "/bin/sh", "-c", `nerdctl -v | /openaf/oafp path="split(@,' ')[2]"`])
               .sh(["docker", "run", "--rm", "nmaguiar/imgutils:" + args.tag, "/bin/sh", "-c", `dive -v | /openaf/oafp path="split(@,' ').split([1],'-')[0]"`])
               .sh(["docker", "run", "--rm", "nmaguiar/imgutils:" + args.tag, "/bin/sh", "-c", `TERM=UTF-8 mc -V | /openaf/oafp in=lines linesjoin=true path="split([0], ' ')[3]"`])
               .getJson()

diff --git a/Dockerfile b/Dockerfile
@@ -18,21 +18,28 @@
 FROM openaf/oaf as main
 
 #COPY --from=dive /dive /usr/bin/dive
-COPY README.md /README.md
+#COPY README.md /README.md
 
 USER root
+# Setup all tools
+# ---------------
 RUN apk update\
- && apk --no-cache add docker-cli skopeo curl tar bash gzip mc\
+ && apk --no-cache add docker-cli skopeo curl tar bash gzip mc containerd-ctr nerdctl bash-completion\
  && /openaf/ojob ojob.io/kube/getCriCtl path=/usr/bin\
  && /openaf/ojob ojob.io/kube/getHelm path=/usr/bin\
  && /openaf/opack install DockerRegistry\
  && /openaf/opack install Kube\
  && /openaf/opack install BouncyCastle\
  && /openaf/opack install oafproc\
  && mkdir /openaf/ojobs\
- && /openaf/ojob ojob.io/get job=ojob.io/docker/expand.yaml > /openaf/ojobs/expand.yaml\
- && /openaf/ojob ojob.io/get job=ojob.io/docker/collapse.yaml > /openaf/ojobs/collapse.yaml\
+ && /openaf/ojob ojob.io/get job=ojob.io/docker/expand.yaml > /openaf/ojobs/imgExpand.yaml\
+ && /openaf/ojob ojob.io/get job=ojob.io/docker/collapse.yaml > /openaf/ojobs/imgCollapse.yaml\
  && /openaf/ojob ojob.io/get job=ojob.io/docker/listHubRepo.yaml > /openaf/ojobs/listHubRepo.yaml\
+ && /openaf/ojob ojob.io/get job=ojob.io/oaf/colorFormats.yaml > /openaf/ojobs/colorFormats.yaml\
+ && /openaf/oaf --sb /openaf/ojobs/imgExpand.yaml\
+ && /openaf/oaf --sb /openaf/ojobs/imgCollapse.yaml\
+ && /openaf/oaf --sb /openaf/ojobs/listHubRepo.yaml\
+ && /openaf/oaf --sb /openaf/ojobs/colorFormats.yaml\
  && chown -R openaf:0 /openaf\
  && chown openaf:0 /openaf/.opack.db\
  && chmod -R u+rwx,g+rwx,o+rx,o-w /openaf/*\
@@ -41,22 +48,77 @@ RUN apk update\
  && sudo chmod g+w /openaf/.opack.db\
  && chmod a+x /usr/bin/crictl\
  && chmod a+x /usr/bin/helm\
- && rm /lib/apk/db/*
+ && cp /usr/bin/ctr /tmp/ctr\
+ && apk del containerd-ctr\
+ && mv /tmp/ctr /usr/bin/ctr\
+ && cp /usr/bin/nerdctl /tmp/nerdctl\
+ && apk del nerdctl\
+ && mv /tmp/nerdctl /usr/bin/nerdctl\
+ && rm /lib/apk/db/*\
+ && sed -i "s/\/bin\/sh/\/bin\/bash/g" /etc/passwd
 
+# Setup bash completion
+# ---------------------
+RUN echo "source <(crictl completion bash)" >> /etc/bash/start.sh\
+ && echo "source <(helm completion bash)" >> /etc/bash/start.sh\
+ && echo "source <(docker completion bash)" >> /etc/bash/start.sh\
+ && echo "source <(skopeo completion bash)" >> /etc/bash/start.sh\
+ && curl -s https://ojob.io/autoComplete.sh -o /etc/.openaf-ojobio-complete\
+ && echo "source /etc/.openaf-ojobio-complete" >> /etc/bash/start.sh
+
+# Setup Dive
+# ----------
 RUN cd /tmp\
  && skopeo copy docker://wagoodman/dive docker-archive:dive.tar\
  && /openaf/ojob ojob.io/docker/expand image=dive.tar output=output\
  && cp /tmp/output/usr/local/bin/dive /usr/bin/dive\
  && rm -rf output\
  && rm dive.tar
 
+# Setup imgutils folder
+# ---------------------
+RUN mkdir /imgutils\
+ && chmod a+rwx /imgutils\
+ && chown openaf:0 /imgutils
+
+# Setup welcome message and vars
+# ------------------------------
+COPY welcome.txt /etc/imgutils
+RUN gzip /etc/imgutils\
+ && echo "zcat /etc/imgutils.gz" >> /etc/bash/start.sh\
+ && echo "/status" >> /etc/bash/start.sh\
+ && echo "echo ''" >> /etc/bash/start.sh\
+ && echo "export CONTAINER_RUNTIME_ENDPOINT=unix:///run/containerd/containerd.sock" >> /etc/bash/start.sh\
+ && echo "export IMAGE_SERVICE_ENDPOINT=unix:///run/containerd/containerd.sock" >> /etc/bash/start.sh\
+ && echo "alias oafptab='oafp in=lines linesvisual=true linesjoin=true out=ctable'" >> /etc/bash/start.sh\
+ && echo "alias oaf-light-theme='colorFormats.yaml op=set theme=thin-light-bold'" >> /etc/bash/start.sh\
+ && echo "alias oaf-dark-theme='colorFormats.yaml op=set theme=thin-intense-bold'" >> /etc/bash/start.sh\
+ && echo "alias help='source /etc/bash/start.sh'" >> /etc/bash/start.sh\
+ && cp /etc/bash/start.sh /etc/profile.d/start.sh
+
+# Setup usage and examples
+# ------------------------
+COPY USAGE.md /USAGE.md
+COPY EXAMPLES.md /EXAMPLES.md
+COPY status.sh /status
+RUN gzip /USAGE.md\
+ && gzip /EXAMPLES.md\
+ && echo "#!/bin/sh" > /usr/bin/usage-help\
+ && echo "zcat /USAGE.md.gz | oafp in=md mdtemplate=true | less -r" >> /usr/bin/usage-help\
+ && echo "#!/bin/sh" > /usr/bin/examples-help\
+ && echo "zcat /EXAMPLES.md.gz | oafp in=md mdtemplate=true | less -r" > /usr/bin/examples-help\
+ && chmod a+x /usr/bin/usage-help\
+ && chmod a+x /usr/bin/examples-help\
+ && chmod a+x /status
+
 # -------------------
 FROM scratch as final
 
 COPY --from=main / /
 
 ENV OAF_HOME=/openaf
-ENV PATH=$PATH:$OAF_HOME
+ENV PATH=$PATH:$OAF_HOME:$OAF_HOME/ojobs
 USER openaf
 
-WORKDIR /openaf
+WORKDIR /imgutils
+CMD ["/usr/bin/usage-help"]