Skip to content

Commit

Permalink
Prevent shell redirection when installing packages
Browse files Browse the repository at this point in the history
  • Loading branch information
jefferbrecht committed Oct 24, 2023
1 parent daa82fb commit b758a40
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ RUN set -x; \
zypper -n update && \
# zypper/libcurl has a use-after-free bug that causes segfaults for particular download sequences.
# If this bug happens to trigger in the future, adding a "zypper -n download" of a subset of the packages can avoid the segfault.
zypper -n install bison>3.4 && \
zypper -n install "bison>3.4" && \
# Allow fluent-bit to find systemd
ln -fs /usr/lib/systemd /lib/systemd
COPY --from=openjdk-install /usr/local/java-${OPENJDK_MAJOR_VERSION}-openjdk/ /usr/local/java-${OPENJDK_MAJOR_VERSION}-openjdk
Expand Down Expand Up @@ -807,7 +807,7 @@ ARG OPENJDK_MAJOR_VERSION

RUN set -x; zypper -n refresh && \
zypper -n update && \
zypper -n install git systemd autoconf automake flex libtool libcurl-devel libopenssl-devel libyajl-devel gcc gcc-c++ zlib-devel rpm-build expect cmake systemd-devel systemd-rpm-macros unzip zip bison>3.4
zypper -n install git systemd autoconf automake flex libtool libcurl-devel libopenssl-devel libyajl-devel gcc gcc-c++ zlib-devel rpm-build expect cmake systemd-devel systemd-rpm-macros unzip zip "bison>3.4"
# Allow fluent-bit to find systemd
RUN ln -fs /usr/lib/systemd /lib/systemd
COPY --from=openjdk-install /usr/local/java-${OPENJDK_MAJOR_VERSION}-openjdk/ /usr/local/java-${OPENJDK_MAJOR_VERSION}-openjdk
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/compile.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ var dockerfileArguments = []templateArguments{
zypper -n update && \
# zypper/libcurl has a use-after-free bug that causes segfaults for particular download sequences.
# If this bug happens to trigger in the future, adding a "zypper -n download" of a subset of the packages can avoid the segfault.
zypper -n install bison>3.4 && \
zypper -n install "bison>3.4" && \
# Allow fluent-bit to find systemd
ln -fs /usr/lib/systemd /lib/systemd` + installJava + installCMake,
package_build: "RUN ./pkg/rpm/build.sh",
Expand All @@ -180,7 +180,7 @@ var dockerfileArguments = []templateArguments{
target_name: "sles15",
install_packages: `RUN set -x; zypper -n refresh && \
zypper -n update && \
zypper -n install git systemd autoconf automake flex libtool libcurl-devel libopenssl-devel libyajl-devel gcc gcc-c++ zlib-devel rpm-build expect cmake systemd-devel systemd-rpm-macros unzip zip bison>3.4
zypper -n install git systemd autoconf automake flex libtool libcurl-devel libopenssl-devel libyajl-devel gcc gcc-c++ zlib-devel rpm-build expect cmake systemd-devel systemd-rpm-macros unzip zip "bison>3.4"
# Allow fluent-bit to find systemd
RUN ln -fs /usr/lib/systemd /lib/systemd` + installJava + installCMake,
package_build: "RUN ./pkg/rpm/build.sh",
Expand Down

0 comments on commit b758a40

Please sign in to comment.