Skip to content

Commit

Permalink
Trying to repair dependency which stopped working (protoc for golang) (
Browse files Browse the repository at this point in the history
…#4173)

* Trying to repair dependency which stopped working (protoc for golang): upgrading go

Signed-off-by: Grzegorz Bazior (Yodiss PSA) <g.bazior@yodiss.pl>

---------

Signed-off-by: Grzegorz Bazior (Yodiss PSA) <g.bazior@yodiss.pl>
Co-authored-by: Grzegorz Bazior (Yodiss PSA) <g.bazior@yodiss.pl>
  • Loading branch information
baziorek and Grzegorz Bazior (Yodiss PSA) committed Jan 9, 2024
1 parent 29a31db commit 91b8b5a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion docker/develop/Dockerfile
Expand Up @@ -40,11 +40,12 @@ RUN set -e; \
fi

# golang stuff
RUN curl https://dl.google.com/go/go1.14.2.linux-$(dpkg --print-architecture).tar.gz | tar -C /opt -xz
RUN curl https://dl.google.com/go/go1.17.2.linux-$(dpkg --print-architecture).tar.gz | tar -C /opt -xz
ENV GOPATH=/opt/gopath
RUN mkdir ${GOPATH}
ENV PATH=${PATH}:/opt/go/bin:${GOPATH}/bin
RUN go get github.com/golang/protobuf/protoc-gen-go
RUN export PATH="$PATH:$(go env GOPATH)/bin" # according to: https://grpc.io/docs/languages/go/quickstart/

## pip3 contains fresher versions of packages than apt
RUN pip3 install --no-cache-dir cmake ninja
Expand Down
3 changes: 2 additions & 1 deletion docker/iroha-builder/Dockerfile
Expand Up @@ -40,11 +40,12 @@ RUN cd /opt/ && \
PREFIX="/usr/local" make install

## golang stuff for iroha+burrow
RUN curl -fL https://golang.org/dl/go1.14.2.linux-$(dpkg --print-architecture).tar.gz | tar -C /opt -xz
RUN curl -fL https://golang.org/dl/go1.17.2.linux-$(dpkg --print-architecture).tar.gz | tar -C /opt -xz
ENV GOPATH=/opt/gopath
RUN mkdir ${GOPATH}
ENV PATH=${PATH}:/opt/go/bin:${GOPATH}/bin
RUN go get github.com/golang/protobuf/protoc-gen-go
RUN export PATH="$PATH:$(go env GOPATH)/bin" # according to: https://grpc.io/docs/languages/go/quickstart/

## Rust-lang stuff for iroha+ursa
ENV RUSTUP_HOME=/opt/rust
Expand Down

0 comments on commit 91b8b5a

Please sign in to comment.