chore: add ca-certificates to yap oci image (#30)

M0Rf30 · Oct 17, 2023 · aff9c00 · aff9c00
1 parent 9b3ecf2
commit aff9c00
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 18 deletions.
diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile
@@ -15,7 +15,10 @@ RUN \
 FROM docker.io/alpine:latest
 COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
-  apk add --no-cache bash-completion sudo; \
+  apk add --no-cache \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /etc/bash_completion.d/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc;
 

diff --git a/docker/amazon-1/Dockerfile b/docker/amazon-1/Dockerfile
@@ -22,7 +22,10 @@ RUN \
 FROM docker.io/amazonlinux:1
 COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
-  yum -y install bash-completion sudo; \
+  yum -y install \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /etc/bash_completion.d/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
   yum clean all

diff --git a/docker/amazon-2/Dockerfile b/docker/amazon-2/Dockerfile
@@ -22,7 +22,10 @@ RUN \
 FROM docker.io/amazonlinux:2
 COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
-  yum -y install bash-completion sudo; \
+  yum -y install \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /etc/bash_completion.d/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
   yum clean all

diff --git a/docker/arch/Dockerfile b/docker/arch/Dockerfile
@@ -10,14 +10,15 @@ RUN \
 COPY . /project
 WORKDIR /project
 RUN \
-  go build -ldflags "-w -s" -trimpath -mod=readonly -modcacherw -o /usr/bin/; \
-  echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
-  rm -rf /project
+  go build -ldflags "-w -s" -trimpath -mod=readonly -modcacherw -o /usr/bin/
 
 FROM docker.io/archlinux:base
 COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
-  pacman -Syu --noconfirm bash-completion sudo; \
+  pacman -Syu --noconfirm \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   rm -rf /var/cache/pacman/* \
   yap completion bash > /etc/bash_completion.d/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc;

diff --git a/docker/debian-buster/Dockerfile b/docker/debian-buster/Dockerfile
@@ -26,7 +26,10 @@ COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
   apt-get update; \
   apt-get upgrade; \
-  apt-get install -y --no-install-recommends bash-completion sudo; \
+  apt-get install -y --no-install-recommends \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /usr/share/bash-completion/completions/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc; \
   apt-get clean; \

diff --git a/docker/debian-jessie/Dockerfile b/docker/debian-jessie/Dockerfile
@@ -26,7 +26,10 @@ COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
   apt-get update; \
   apt-get upgrade; \
-  apt-get install -y --no-install-recommends bash-completion sudo; \
+  apt-get install -y --no-install-recommends \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /usr/share/bash-completion/completions/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc; \
   apt-get clean; \

diff --git a/docker/debian-stretch/Dockerfile b/docker/debian-stretch/Dockerfile
@@ -26,7 +26,10 @@ COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
   apt-get update; \
   apt-get upgrade; \
-  apt-get install -y --no-install-recommends bash-completion sudo; \
+  apt-get install -y --no-install-recommends \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /usr/share/bash-completion/completions/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc; \
   apt-get clean; \

diff --git a/docker/opensuse-tubleweed/Dockerfile b/docker/opensuse-tubleweed/Dockerfile
@@ -3,18 +3,22 @@ LABEL org.opencontainers.image.title="yap"
 LABEL org.opencontainers.image.description="Package software with ease 📦"
 LABEL org.opencontainers.image.vendor="M0Rf30"
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN \
-  zypper -n install -y bash-completion go sudo
+  zypper -n install -y go
 
 COPY . /project
 WORKDIR /project
 RUN \
-  go build -ldflags "-w -s" -trimpath -mod=readonly -modcacherw -o /usr/bin/; \
+  go build -ldflags "-w -s" -trimpath -mod=readonly -modcacherw -o /usr/bin/
 
 FROM docker.io/opensuse/tumbleweed:latest
 COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
-  zypper -n install -y bash-completion sudo; \
+  zypper -n install -y \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /usr/share/bash-completion/completions/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc;
 

diff --git a/docker/rocky-8/Dockerfile b/docker/rocky-8/Dockerfile
@@ -22,7 +22,10 @@ RUN \
 FROM docker.io/rockylinux/rockylinux:8
 COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
-  dnf -y install bash-completion sudo; \
+  dnf -y install \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /etc/bash_completion.d/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
   dnf clean all

diff --git a/docker/rocky-9/Dockerfile b/docker/rocky-9/Dockerfile
@@ -22,7 +22,10 @@ RUN \
 FROM docker.io/rockylinux/rockylinux:9
 COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
-  dnf -y install bash-completion sudo; \
+  dnf -y install \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /etc/bash_completion.d/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
   dnf clean all

diff --git a/docker/ubuntu-bionic/Dockerfile b/docker/ubuntu-bionic/Dockerfile
@@ -26,7 +26,10 @@ COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
   apt-get update; \
   apt-get upgrade; \
-  apt-get install -y --no-install-recommends bash-completion sudo; \
+  apt-get install -y --no-install-recommends \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /usr/share/bash-completion/completions/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc; \
   apt-get clean; \

diff --git a/docker/ubuntu-focal/Dockerfile b/docker/ubuntu-focal/Dockerfile
@@ -26,7 +26,10 @@ COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
   apt-get update; \
   apt-get upgrade; \
-  apt-get install -y --no-install-recommends bash-completion sudo; \
+  apt-get install -y --no-install-recommends \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /usr/share/bash-completion/completions/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc; \
   apt-get clean; \

diff --git a/docker/ubuntu-jammy/Dockerfile b/docker/ubuntu-jammy/Dockerfile
@@ -26,7 +26,10 @@ COPY --from=builder /usr/bin/yap /usr/bin/yap
 RUN \
   apt-get update; \
   apt-get upgrade; \
-  apt-get install -y --no-install-recommends bash-completion sudo; \
+  apt-get install -y --no-install-recommends \
+    bash-completion \
+    ca-certificates \
+    sudo; \
   yap completion bash > /usr/share/bash-completion/completions/yap; \
   echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc; \
   apt-get clean; \