mirror of
https://github.com/gravitational/teleport
synced 2024-10-19 08:43:58 +00:00
build.assets Dockerfiles: Remove unnecessary ENV NODE_URL, pass fsSL to curl (#23182)
* build.assets Dockerfiles: Remove unnecessary ENV NODE_URL
NODE_URL is being redefined within the RUN instruction anyway. We suspect
it might be causing problems because sometimes the logs from build failures
suggest that the NODE_URL export was either ignored or ${NODE_URL} passed
to curl reads ENV NODE_URL and not the env var set within the shell.
* Pass fsSl flags to curl
This commit is contained in:
Rafał Cieślak
GitHub
parent
2d387e179f
commit
81f319d3e3
|
|
@ -156,12 +156,12 @@ RUN apt-get -y update && \
|
|||
|
||||
# Install gcloud SDK and Firestore emulator.
|
||||
ENV PATH="$PATH:/opt/google-cloud-sdk/bin"
|
||||
RUN (curl -sSLf https://sdk.cloud.google.com | bash -s -- --install-dir=/opt --disable-prompts) && \
|
||||
RUN (curl -fsSL https://sdk.cloud.google.com | bash -s -- --install-dir=/opt --disable-prompts) && \
|
||||
gcloud components install cloud-firestore-emulator beta && \
|
||||
rm -rf /opt/google-cloud-sdk/.install/.backup
|
||||
|
||||
# Install etcd.
|
||||
RUN curl -Lf https://github.com/coreos/etcd/releases/download/v3.3.9/etcd-v3.3.9-linux-${BUILDARCH}.tar.gz | tar -xz && \
|
||||
RUN curl -fsSL https://github.com/coreos/etcd/releases/download/v3.3.9/etcd-v3.3.9-linux-${BUILDARCH}.tar.gz | tar -xz && \
|
||||
cp etcd-v3.3.9-linux-${BUILDARCH}/etcd* /bin/ && \
|
||||
rm -rf etcd-v3.3.9-linux-${BUILDARCH}
|
||||
|
||||
|
|
@ -185,7 +185,7 @@ RUN mkdir -p $RUSTUP_HOME && chmod a+w $RUSTUP_HOME && \
|
|||
# Cross-compilation targets are only installed on amd64, as
|
||||
# this image doesn't contain gcc-multilib.
|
||||
USER ci
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain $RUST_VERSION && \
|
||||
RUN curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain $RUST_VERSION && \
|
||||
rustup --version && \
|
||||
cargo --version && \
|
||||
rustc --version && \
|
||||
|
|
@ -197,19 +197,18 @@ USER root
|
|||
|
||||
# Install Node.js.
|
||||
ARG NODE_VERSION
|
||||
ENV NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${BUILDARCH}.tar.xz"
|
||||
ENV NODE_PATH="/usr/local/lib/nodejs-linux"
|
||||
ENV PATH="$PATH:${NODE_PATH}/bin"
|
||||
RUN export NODE_ARCH=$(if [ "$BUILDARCH" = "amd64" ]; then echo "x64"; else echo "arm64"; fi) && \
|
||||
export NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.xz" && \
|
||||
mkdir -p ${NODE_PATH} && \
|
||||
curl -o /tmp/nodejs.tar.xz -Lf ${NODE_URL} && \
|
||||
curl -o /tmp/nodejs.tar.xz -fsSL ${NODE_URL} && \
|
||||
tar -xJf /tmp/nodejs.tar.xz -C /usr/local/lib/nodejs-linux --strip-components=1
|
||||
RUN corepack enable yarn
|
||||
|
||||
# Install Go.
|
||||
ARG GOLANG_VERSION
|
||||
RUN mkdir -p /opt && cd /opt && curl -Lf https://storage.googleapis.com/golang/$GOLANG_VERSION.linux-${BUILDARCH}.tar.gz | tar xz && \
|
||||
RUN mkdir -p /opt && cd /opt && curl -fsSL https://storage.googleapis.com/golang/$GOLANG_VERSION.linux-${BUILDARCH}.tar.gz | tar xz && \
|
||||
mkdir -p /go/src/github.com/gravitational/teleport && \
|
||||
chmod a+w /go && \
|
||||
chmod a+w /var/lib && \
|
||||
|
|
@ -224,20 +223,20 @@ RUN make -C /opt/pam_teleport install
|
|||
ENV SOFTHSM2_PATH "/usr/lib/softhsm/libsofthsm2.so"
|
||||
|
||||
# Install bats.
|
||||
RUN curl -Lf https://github.com/bats-core/bats-core/archive/v1.2.1.tar.gz | tar -xz && \
|
||||
RUN curl -fsSL https://github.com/bats-core/bats-core/archive/v1.2.1.tar.gz | tar -xz && \
|
||||
cd bats-core-1.2.1 && ./install.sh /usr/local && cd .. && \
|
||||
rm -r bats-core-1.2.1
|
||||
|
||||
# Install shellcheck.
|
||||
RUN scversion='v0.9.0' && \
|
||||
curl -sSLf "https://github.com/koalaman/shellcheck/releases/download/$scversion/shellcheck-$scversion.linux.$(if [ "$BUILDARCH" = "amd64" ]; then echo "x86_64"; else echo "aarch64"; fi).tar.xz" | \
|
||||
curl -fsSL "https://github.com/koalaman/shellcheck/releases/download/$scversion/shellcheck-$scversion.linux.$(if [ "$BUILDARCH" = "amd64" ]; then echo "x86_64"; else echo "aarch64"; fi).tar.xz" | \
|
||||
tar -xJv && \
|
||||
cp "shellcheck-$scversion/shellcheck" /usr/local/bin/ && \
|
||||
shellcheck --version
|
||||
|
||||
# Install helm.
|
||||
RUN mkdir -p helm-tarball && \
|
||||
curl -Lf https://get.helm.sh/helm-v3.5.2-$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C helm-tarball -xz && \
|
||||
curl -fsSL https://get.helm.sh/helm-v3.5.2-$(go env GOOS)-$(go env GOARCH).tar.gz | tar -C helm-tarball -xz && \
|
||||
cp helm-tarball/$(go env GOOS)-$(go env GOARCH)/helm /bin/ && \
|
||||
rm -r helm-tarball*
|
||||
# TODO(hugoShaka): remove this backward compatible hack with teleportv13 buildbox
|
||||
|
|
@ -262,7 +261,7 @@ ARG GOGO_PROTO_TAG
|
|||
ENV GOGOPROTO_ROOT ${GOPATH}/src/github.com/gogo/protobuf
|
||||
|
||||
RUN (export PROTOC_TARBALL=protoc-${PROTOC_VER}-linux-$(if [ "$BUILDARCH" = "amd64" ]; then echo "x86_64"; else echo "aarch_64"; fi).zip && \
|
||||
curl -Lf -o /tmp/${PROTOC_TARBALL} https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/${PROTOC_TARBALL} && \
|
||||
curl -fsSL -o /tmp/${PROTOC_TARBALL} https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/${PROTOC_TARBALL} && \
|
||||
cd /tmp && unzip /tmp/${PROTOC_TARBALL} -d /usr/local && \
|
||||
chmod -R a+r /usr/local/include/google/protobuf && \
|
||||
chmod -R a+xr /usr/local/bin/protoc && \
|
||||
|
|
@ -287,7 +286,7 @@ RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2
|
|||
# Install Buf.
|
||||
RUN BIN="/usr/local/bin" && \
|
||||
VERSION="1.15.1" && \
|
||||
curl -sSLf \
|
||||
curl -fsSL \
|
||||
"https://github.com/bufbuild/buf/releases/download/v${VERSION}/buf-$(uname -s)-$(uname -m)" \
|
||||
-o "${BIN}/buf" && \
|
||||
chmod +x "${BIN}/buf"
|
||||
|
|
|
|||
|
|
@ -202,12 +202,12 @@ COPY --from=git2 /opt/git /usr/local
|
|||
ARG BUILDARCH
|
||||
|
||||
# Install etcd.
|
||||
RUN (curl -Lf https://github.com/coreos/etcd/releases/download/v3.3.9/etcd-v3.3.9-linux-${BUILDARCH}.tar.gz | tar -xz && \
|
||||
RUN (curl -fsSL https://github.com/coreos/etcd/releases/download/v3.3.9/etcd-v3.3.9-linux-${BUILDARCH}.tar.gz | tar -xz && \
|
||||
cp etcd-v3.3.9-linux-${BUILDARCH}/etcd* /bin/ && \
|
||||
rm -rf etcd-v3.3.9-linux-${BUILDARCH})
|
||||
|
||||
# Install Go.
|
||||
RUN mkdir -p /opt && cd /opt && curl -f https://storage.googleapis.com/golang/$GOLANG_VERSION.linux-${BUILDARCH}.tar.gz | tar xz && \
|
||||
RUN mkdir -p /opt && cd /opt && curl -fsSL https://storage.googleapis.com/golang/$GOLANG_VERSION.linux-${BUILDARCH}.tar.gz | tar xz && \
|
||||
mkdir -p /go/src/github.com/gravitational/teleport && \
|
||||
chmod a+w /go && \
|
||||
chmod a+w /var/lib && \
|
||||
|
|
@ -225,7 +225,7 @@ ENV PATH="$PATH:${NODE_PATH}/bin"
|
|||
RUN export NODE_ARCH=$(if [ "$BUILDARCH" = "amd64" ]; then echo "x64"; else echo "arm64"; fi) && \
|
||||
export NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.xz" && \
|
||||
mkdir -p ${NODE_PATH} && \
|
||||
curl -o /tmp/nodejs.tar.xz -Lf ${NODE_URL} && \
|
||||
curl -o /tmp/nodejs.tar.xz -fsSL ${NODE_URL} && \
|
||||
tar -xJf /tmp/nodejs.tar.xz -C /usr/local/lib/nodejs-linux --strip-components=1
|
||||
RUN node --version
|
||||
RUN corepack enable yarn
|
||||
|
|
@ -246,7 +246,7 @@ RUN mkdir -p $RUSTUP_HOME && chmod a+w $RUSTUP_HOME && \
|
|||
RUN chmod a-w /
|
||||
|
||||
USER ci
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain $RUST_VERSION && \
|
||||
RUN curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain $RUST_VERSION && \
|
||||
rustup --version && \
|
||||
cargo --version && \
|
||||
rustc --version
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ RUN yum groupinstall -y 'Development Tools' && \
|
|||
|
||||
|
||||
RUN mkdir -p /opt && cd /opt && \
|
||||
curl -sfLO https://go.dev/dl/go1.12.7.linux-amd64.tar.gz && \
|
||||
curl -fsSLO https://go.dev/dl/go1.12.7.linux-amd64.tar.gz && \
|
||||
echo "66d83bfb5a9ede000e33c6579a91a29e6b101829ad41fffb5c5bb6c900e109d9" "go1.12.7.linux-amd64.tar.gz" | sha256sum --check && \
|
||||
tar xf go1.12.7.linux-amd64.tar.gz && \
|
||||
rm -f go1.12.7.linux-amd64.tar.gz && \
|
||||
|
|
@ -114,12 +114,12 @@ RUN yum groupinstall -y 'Development Tools' && \
|
|||
yum clean all
|
||||
|
||||
# Install etcd.
|
||||
RUN (curl -Lf https://github.com/coreos/etcd/releases/download/v3.3.9/etcd-v3.3.9-linux-amd64.tar.gz | tar -xz && \
|
||||
RUN (curl -fsSL https://github.com/coreos/etcd/releases/download/v3.3.9/etcd-v3.3.9-linux-amd64.tar.gz | tar -xz && \
|
||||
cp etcd-v3.3.9-linux-amd64/etcd* /bin/)
|
||||
|
||||
# Install Go.
|
||||
ARG GOLANG_VERSION
|
||||
RUN mkdir -p /opt && cd /opt && curl -f https://storage.googleapis.com/golang/$GOLANG_VERSION.linux-amd64.tar.gz | tar xz && \
|
||||
RUN mkdir -p /opt && cd /opt && curl -fsSL https://storage.googleapis.com/golang/$GOLANG_VERSION.linux-amd64.tar.gz | tar xz && \
|
||||
mkdir -p /go/src/github.com/gravitational/teleport && \
|
||||
chmod a+w /go && \
|
||||
chmod a+w /var/lib && \
|
||||
|
|
@ -132,14 +132,13 @@ ENV GOEXPERIMENT=boringcrypto \
|
|||
# Install node.
|
||||
RUN yum install -y python3
|
||||
ARG NODE_VERSION
|
||||
ENV NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${BUILDARCH}.tar.xz"
|
||||
ENV NODE_PATH="/usr/local/lib/nodejs-linux"
|
||||
ENV PATH="$PATH:${NODE_PATH}/bin"
|
||||
RUN export NODE_ARCH=$(if [ "$BUILDARCH" = "amd64" ]; then echo "x64"; else echo "arm64"; fi) && \
|
||||
export NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
|
||||
mkdir -p ${NODE_PATH} && \
|
||||
curl -o /tmp/nodejs.tar.xz -Lf ${NODE_URL} && \
|
||||
tar -xJf /tmp/nodejs.tar.xz -C /usr/local/lib/nodejs-linux --strip-components=1
|
||||
export NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz" && \
|
||||
mkdir -p ${NODE_PATH} && \
|
||||
curl -o /tmp/nodejs.tar.xz -fsSL ${NODE_URL} && \
|
||||
tar -xJf /tmp/nodejs.tar.xz -C /usr/local/lib/nodejs-linux --strip-components=1
|
||||
RUN node --version
|
||||
RUN corepack enable yarn
|
||||
|
||||
|
|
@ -161,7 +160,7 @@ RUN mkdir -p $RUSTUP_HOME && chmod a+w $RUSTUP_HOME && \
|
|||
# Install Rust using the ci user, as that is the user that
|
||||
# will run builds using the Rust toolchains we install here.
|
||||
USER ci
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain $RUST_VERSION && \
|
||||
RUN curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain $RUST_VERSION && \
|
||||
rustup --version && \
|
||||
cargo --version && \
|
||||
rustc --version && \
|
||||
|
|
|
|||
|
|
@ -135,14 +135,13 @@ ARG BUILDARCH
|
|||
|
||||
# Install Nodejs
|
||||
ARG NODE_VERSION
|
||||
ENV NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${BUILDARCH}.tar.xz"
|
||||
ENV NODE_PATH="/usr/local/lib/nodejs-linux"
|
||||
ENV PATH="$PATH:${NODE_PATH}/bin"
|
||||
RUN export NODE_ARCH=$(if [ "$BUILDARCH" = "amd64" ]; then echo "x64"; else echo "arm64"; fi) && \
|
||||
export NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.xz" && \
|
||||
mkdir -p ${NODE_PATH} && \
|
||||
curl -o /tmp/nodejs.tar.xz -L ${NODE_URL} && \
|
||||
tar -xJf /tmp/nodejs.tar.xz -C /usr/local/lib/nodejs-linux --strip-components=1
|
||||
export NODE_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.xz" && \
|
||||
mkdir -p ${NODE_PATH} && \
|
||||
curl -o /tmp/nodejs.tar.xz -L ${NODE_URL} && \
|
||||
tar -xJf /tmp/nodejs.tar.xz -C /usr/local/lib/nodejs-linux --strip-components=1
|
||||
RUN corepack enable yarn
|
||||
|
||||
# Install libbpf
|
||||
|
|
|
|||
Loading…
Reference in a new issue