self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-19 16:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop gcloud SDK from buildbox (#30640)

Browse source 
* Drop gcloud SDK from buildbox

* nit: Sort package list

* Drop Makefile references to gcloud
This commit is contained in:
Alan Parra 2023-08-18 11:21:24 -03:00 committed by GitHub
parent 80480bfff3
commit 9f227c5dfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build.assets/Dockerfile
View file

@ -111,7 +111,6 @@ ENV LANGUAGE="en_US.UTF-8" \
ARG BUILDARCH
# Install packages.
# Java JRE is required by gcloud firestore emulator.
# Latest git 2.18+ is required for GitHub actions.
# NOTE: gcc-multilib is not available on ARM, so ony amd64 version includes it.
RUN apt-get -y update && \
@ -126,7 +125,6 @@ RUN apt-get -y update && \
clang \
clang-format \
curl \
default-jre \
`if [ "$BUILDARCH" = "amd64" ] ; then echo gcc-multilib; fi` \
git \
gnupg \
@ -134,6 +132,7 @@ RUN apt-get -y update && \
libc6-dev \
libelf-dev \
libpam-dev \
libpcsclite-dev \
libsqlite3-0 \
libssl-dev \
llvm \
@ -142,20 +141,19 @@ RUN apt-get -y update && \
mingw-w64-x86-64-dev \
net-tools \
openssh-client \
pkg-config \
python3-pip \
python3-setuptools \
python3-wheel \
pkg-config \
# rsync is required for some integration tests
rsync \
softhsm2 \
sudo \
tree \
unzip \
xauth \
zip \
zlib1g-dev \
xauth \
libpcsclite-dev \
&& \
install -m 0755 -d /etc/apt/keyrings && \
gpg --dearmor -o /etc/apt/keyrings/docker.gpg docker.gpg && \
@ -184,12 +182,6 @@ RUN --mount=type=bind,target=/context \
&& rm -rf /tmp/osslsigncode \
&& rm osslsigncode.zip
# Install gcloud SDK and Firestore emulator.
ENV PATH="$PATH:/opt/google-cloud-sdk/bin"
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 -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/ && \

4
build.assets/Makefile
View file

@ -262,8 +262,6 @@ test: buildbox
$(DOCKERFLAGS) $(NOROOT) -t $(BUILDBOX) \
/bin/bash -c \
"examples/etcd/start-etcd.sh & sleep 1; \
type gcloud 2>&1 >/dev/null || exit 1; \
gcloud -q beta emulators firestore start --host-port=localhost:8618 & sleep 1; \
ssh-agent > external.agent.tmp && source external.agent.tmp; \
cd $(SRCDIR) && make TELEPORT_DEBUG=0 FLAGS='-cover -race' clean test"
@ -275,8 +273,6 @@ test-root: buildbox
$(DOCKERFLAGS) -t $(BUILDBOX) \
/bin/bash -c \
"examples/etcd/start-etcd.sh & sleep 1; \
type gcloud 2>&1 >/dev/null || exit 1; \
gcloud -q beta emulators firestore start --host-port=localhost:8618 & sleep 1; \
ssh-agent > external.agent.tmp && source external.agent.tmp; \
cd $(SRCDIR) && make TELEPORT_DEBUG=0 FLAGS='-cover -race' clean test-go-root"