Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dockerfiles: run tar x with --no-same-owner #167

Merged
merged 1 commit into from
Apr 15, 2024
Merged

Dockerfiles: run tar x with --no-same-owner #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions base/ubi8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN \
curl -sSLO "${GH_TGZ_URL}"; \
curl -sSLO "${GH_CHEKSUMS_URL}"; \
sha256sum --ignore-missing -c "gh_${GH_VERSION}_checksums.txt" 2>&1 | grep OK; \
tar -zxvf "${GH_TGZ}"; \
tar -zxv --no-same-owner -f "${GH_TGZ}"; \
mv "gh_${GH_VERSION}_${GH_ARCH}"/bin/gh /usr/local/bin/; \
mv "gh_${GH_VERSION}_${GH_ARCH}"/share/man/man1/* /usr/local/share/man/man1; \
cd -; \
Expand All @@ -55,7 +55,7 @@ RUN \
RG_TGZ="ripgrep-${RG_VERSION}-${RG_ARCH}.tar.gz"; \
RG_TGZ_URL="https://github.com/BurntSushi/ripgrep/releases/download/${RG_VERSION}/${RG_TGZ}"; \
curl -sSLO "${RG_TGZ_URL}"; \
tar -zxvf "${RG_TGZ}"; \
tar -zxv --no-same-owner -f "${RG_TGZ}"; \
mv "ripgrep-${RG_VERSION}-${RG_ARCH}"/rg /usr/local/bin/; \
mv "ripgrep-${RG_VERSION}-${RG_ARCH}"/doc/rg.1 /usr/local/share/man/man1; \
cd -; \
Expand All @@ -70,7 +70,7 @@ RUN \
BAT_TGZ="bat-v${BAT_VERSION}-${BAT_ARCH}.tar.gz"; \
BAT_TGZ_URL="https://github.com/sharkdp/bat/releases/download/v${BAT_VERSION}/${BAT_TGZ}"; \
curl -sSLO "${BAT_TGZ_URL}"; \
tar -zxvf "${BAT_TGZ}"; \
tar -zxv --no-same-owner -f "${BAT_TGZ}"; \
mv "bat-v${BAT_VERSION}-${BAT_ARCH}"/bat /usr/local/bin/; \
mv "bat-v${BAT_VERSION}-${BAT_ARCH}"/bat.1 /usr/local/share/man/man1; \
cd -; \
Expand All @@ -85,7 +85,7 @@ RUN \
FD_TGZ="fd-v${FD_VERSION}-${FD_ARCH}.tar.gz" && \
FD_TGZ_URL="https://github.com/sharkdp/fd/releases/download/v${FD_VERSION}/${FD_TGZ}" && \
curl -sSLO "${FD_TGZ_URL}" && \
tar -xvf "${FD_TGZ}" && \
tar -xv --no-same-owner -f "${FD_TGZ}" && \
mv "fd-v${FD_VERSION}-${FD_ARCH}"/fd /usr/local/bin && \
mv "fd-v${FD_VERSION}-${FD_ARCH}"/fd.1 /usr/local/share/man/man1 && \
cd - && \
Expand Down
8 changes: 4 additions & 4 deletions base/ubi9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN \
curl -sSLO "${GH_TGZ_URL}"; \
curl -sSLO "${GH_CHEKSUMS_URL}"; \
sha256sum --ignore-missing -c "gh_${GH_VERSION}_checksums.txt" 2>&1 | grep OK; \
tar -zxvf "${GH_TGZ}"; \
tar -zxv --no-same-owner -f "${GH_TGZ}"; \
mv "gh_${GH_VERSION}_${GH_ARCH}"/bin/gh /usr/local/bin/; \
mv "gh_${GH_VERSION}_${GH_ARCH}"/share/man/man1/* /usr/local/share/man/man1; \
cd -; \
Expand All @@ -52,7 +52,7 @@ RUN \
RG_TGZ="ripgrep-${RG_VERSION}-${RG_ARCH}.tar.gz"; \
RG_TGZ_URL="https://github.com/BurntSushi/ripgrep/releases/download/${RG_VERSION}/${RG_TGZ}"; \
curl -sSLO "${RG_TGZ_URL}"; \
tar -zxvf "${RG_TGZ}"; \
tar -zxv --no-same-owner -f "${RG_TGZ}"; \
mv "ripgrep-${RG_VERSION}-${RG_ARCH}"/rg /usr/local/bin/; \
mv "ripgrep-${RG_VERSION}-${RG_ARCH}"/doc/rg.1 /usr/local/share/man/man1; \
cd -; \
Expand All @@ -67,7 +67,7 @@ RUN \
BAT_TGZ="bat-v${BAT_VERSION}-${BAT_ARCH}.tar.gz"; \
BAT_TGZ_URL="https://github.com/sharkdp/bat/releases/download/v${BAT_VERSION}/${BAT_TGZ}"; \
curl -sSLO "${BAT_TGZ_URL}"; \
tar -zxvf "${BAT_TGZ}"; \
tar -zxv --no-same-owner -f "${BAT_TGZ}"; \
mv "bat-v${BAT_VERSION}-${BAT_ARCH}"/bat /usr/local/bin/; \
mv "bat-v${BAT_VERSION}-${BAT_ARCH}"/bat.1 /usr/local/share/man/man1; \
cd -; \
Expand All @@ -82,7 +82,7 @@ RUN \
FD_TGZ="fd-v${FD_VERSION}-${FD_ARCH}.tar.gz" && \
FD_TGZ_URL="https://github.com/sharkdp/fd/releases/download/v${FD_VERSION}/${FD_TGZ}" && \
curl -sSLO "${FD_TGZ_URL}" && \
tar -xvf "${FD_TGZ}" && \
tar -xv --no-same-owner -f "${FD_TGZ}" && \
mv "fd-v${FD_VERSION}-${FD_ARCH}"/fd /usr/local/bin && \
mv "fd-v${FD_VERSION}-${FD_ARCH}"/fd.1 /usr/local/share/man/man1 && \
cd - && \
Expand Down
20 changes: 10 additions & 10 deletions universal/ubi8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSfo rustup https://sh.rustup.rs && \

# camel-k
ENV KAMEL_VERSION 2.2.0
RUN curl -L https://github.com/apache/camel-k/releases/download/v${KAMEL_VERSION}/camel-k-client-${KAMEL_VERSION}-linux-amd64.tar.gz | tar -C /usr/local/bin -xz \
RUN curl -L https://github.com/apache/camel-k/releases/download/v${KAMEL_VERSION}/camel-k-client-${KAMEL_VERSION}-linux-amd64.tar.gz | tar -C /usr/local/bin -xz --no-same-owner \
&& chmod +x /usr/local/bin/kamel

# Config directories
Expand All @@ -198,12 +198,12 @@ RUN mkdir -p /home/tooling/.m2 && \

# oc client
ENV OC_VERSION=4.15
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-${OC_VERSION}/openshift-client-linux.tar.gz | tar -C /usr/local/bin -xz \
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-${OC_VERSION}/openshift-client-linux.tar.gz | tar -C /usr/local/bin -xz --no-same-owner \
&& chmod +x /usr/local/bin/oc

# OS Pipelines CLI (tkn)
ENV TKN_VERSION=1.14.0
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/${TKN_VERSION}/tkn-linux-amd64.tar.gz | tar -C /usr/local/bin -xz \
RUN curl -L https://mirror.openshift.com/pub/openshift-v4/clients/pipelines/${TKN_VERSION}/tkn-linux-amd64.tar.gz | tar -C /usr/local/bin -xz --no-same-owner \
&& chmod +x /usr/local/bin/tkn /usr/local/bin/opc /usr/local/bin/tkn-pac

## podman buildah skopeo
Expand Down Expand Up @@ -239,7 +239,7 @@ COPY --chown=0:0 containers.conf /etc/containers/containers.conf

# Install kubedock
ENV KUBEDOCK_VERSION 0.15.5
RUN curl -L https://github.com/joyrex2001/kubedock/releases/download/${KUBEDOCK_VERSION}/kubedock_${KUBEDOCK_VERSION}_linux_amd64.tar.gz | tar -C /usr/local/bin -xz \
RUN curl -L https://github.com/joyrex2001/kubedock/releases/download/${KUBEDOCK_VERSION}/kubedock_${KUBEDOCK_VERSION}_linux_amd64.tar.gz | tar -C /usr/local/bin -xz --no-same-owner \
&& chmod +x /usr/local/bin/kubedock

# Configure the podman wrapper
Expand Down Expand Up @@ -276,7 +276,7 @@ SHELL_CHECK_ARCH="x86_64"
SHELL_CHECK_TGZ="shellcheck-v${SHELL_CHECK_VERSION}.linux.${SHELL_CHECK_ARCH}.tar.xz"
SHELL_CHECK_TGZ_URL="https://github.com/koalaman/shellcheck/releases/download/v${SHELL_CHECK_VERSION}/${SHELL_CHECK_TGZ}"
curl -sSLO "${SHELL_CHECK_TGZ_URL}"
tar -xvf "${SHELL_CHECK_TGZ}"
tar -xv --no-same-owner -f "${SHELL_CHECK_TGZ}"
mv "${TEMP_DIR}"/shellcheck-v${SHELL_CHECK_VERSION}/shellcheck /bin/shellcheck
cd -
rm -rf "${TEMP_DIR}"
Expand All @@ -300,7 +300,7 @@ echo "$(cat ${KREW_TGZ}.sha256) ${KREW_TGZ}" > "${KREW_TGZ}.sha256"

sha256sum -c "${KREW_TGZ}.sha256" 2>&1 | grep OK

tar -zxvf "${KREW_TGZ}"
tar -zxv --no-same-owner -f "${KREW_TGZ}"
./"krew-${KREW_ARCH}" install krew
echo 'export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"' >> ${PROFILE_EXT}
export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
Expand All @@ -323,7 +323,7 @@ HELM_TGZ_URL="https://get.helm.sh/${HELM_TGZ}"
curl -sSLO "${HELM_TGZ_URL}"
curl -sSLO "${HELM_TGZ_URL}.sha256sum"
sha256sum -c "${HELM_TGZ}.sha256sum" 2>&1 | grep OK
tar -zxvf "${HELM_TGZ}"
tar -zxv --no-same-owner -f "${HELM_TGZ}"
mv "${HELM_ARCH}"/helm /usr/local/bin/helm
cd -
rm -rf "${TEMP_DIR}"
Expand All @@ -342,7 +342,7 @@ KUSTOMIZE_CHEKSUMS_URL="https://github.com/kubernetes-sigs/kustomize/releases/do
curl -sSLO "${KUSTOMIZE_TGZ_URL}"
curl -sSLO "${KUSTOMIZE_CHEKSUMS_URL}"
sha256sum --ignore-missing -c "checksums.txt" 2>&1 | grep OK
tar -zxvf "${KUSTOMIZE_TGZ}"
tar -zxv --no-same-owner -f "${KUSTOMIZE_TGZ}"
mv kustomize /usr/local/bin/
cd -
rm -rf "${TEMP_DIR}"
Expand All @@ -361,7 +361,7 @@ TKN_CHEKSUMS_URL="https://github.com/tektoncd/cli/releases/download/v${TKN_VERSI
curl -sSLO "${TKN_TGZ_URL}"
curl -sSLO "${TKN_CHEKSUMS_URL}"
sha256sum --ignore-missing -c "checksums.txt" 2>&1 | grep OK
tar -zxvf "${TKN_TGZ}"
tar -zxv --no-same-owner -f "${TKN_TGZ}"
mv tkn /usr/local/bin/
cd -
rm -rf "${TEMP_DIR}"
Expand Down Expand Up @@ -425,7 +425,7 @@ E2FSPROGS_CHEKSUMS_URL="https://mirrors.edge.kernel.org/pub/linux/kernel/people/
curl -sSLO "${E2FSPROGS_TGZ_URL}"
curl -sSLO "${E2FSPROGS_CHEKSUMS_URL}"
sha256sum --ignore-missing -c "sha256sums.asc" 2>&1 | grep OK
tar -zxvf "${E2FSPROGS_TGZ}"
tar -zxv --no-same-owner -f "${E2FSPROGS_TGZ}"
cd "e2fsprogs-${E2FSPROGS_VERSION}"
mkdir build
cd build
Expand Down
Loading