Skip to content

fix: add missing dependencies to dogfood image #3470

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

Merged
merged 3 commits into from
Aug 11, 2022
Merged

fix: add missing dependencies to dogfood image #3470

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f92b106
fix: add missing dependencies to dogfood image
sreya Aug 11, 2022
738f268
rm redundant step
sreya Aug 11, 2022
be0521b
rm whitespace
sreya Aug 11, 2022
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
17 changes: 11 additions & 6 deletions dogfood/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ RUN curl --silent --show-error --location \
"https://storage.googleapis.com/go-boringcrypto/go${GOBORING_VERSION}.linux-amd64.tar.gz" \
-o /usr/local/goboring.tar.gz

RUN tar --extract --gzip --directory=/usr/local/goboring --file=/usr/local/goboring.tar.gz --strip-components=1 && \
ln -s /usr/local/goboring/bin/go /usr/local/bin/go
RUN tar --extract --gzip --directory=/usr/local/goboring --file=/usr/local/goboring.tar.gz --strip-components=1

ENV PATH=$PATH:/usr/local/goboring/bin

# Install Go utilities.
ARG GOPATH="/tmp/"
Expand Down Expand Up @@ -64,7 +65,8 @@ RUN mkdir --parents "$GOPATH" && \
go install github.com/dvyukov/go-fuzz/go-fuzz@latest && \
go install github.com/dvyukov/go-fuzz/go-fuzz-build@latest && \
# go-releaser for building 'fat binaries' that work cross-platform
go install github.com/goreleaser/goreleaser@v1.6.1
go install github.com/goreleaser/goreleaser@v1.6.1 && \
go install mvdan.cc/sh/v3/cmd/shfmt@latest

# Ubuntu 20.04 LTS (Focal Fossa)
FROM ubuntu:focal
Expand Down Expand Up @@ -243,7 +245,8 @@ RUN curl --silent --show-error --location --output /usr/local/bin/cloud_sql_prox
RUN yarn global add --prefix=/usr/local \
vercel \
typescript \
typescript-language-server && \
typescript-language-server \
prettier && \
yarn cache clean

# We use yq during "make deploy" to manually substitute out fields in
Expand Down Expand Up @@ -285,8 +288,10 @@ RUN echo "PermitUserEnvironment yes" >>/etc/ssh/sshd_config && \
# are a lot of small files.
COPY --from=go /usr/local/goboring.tar.gz /usr/local/goboring.tar.gz
RUN mkdir /usr/local/goboring && \
tar --extract --gzip --directory=/usr/local/goboring --file=/usr/local/goboring.tar.gz --strip-components=1 && \
ln -s /usr/local/goboring/bin/go /usr/local/bin/go
tar --extract --gzip --directory=/usr/local/goboring --file=/usr/local/goboring.tar.gz --strip-components=1

ENV PATH=$PATH:/usr/local/goboring/bin

COPY --from=go /tmp/bin /usr/local/bin

COPY --from=rust-utils /tmp/bin /usr/local/bin
Expand Down