alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

feat: update gcc to 8.3.0, drop gcompat (#433)

Browse Source 
Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
This commit is contained in:
Andrey Smirnov 2019-03-01 23:48:49 +03:00 committed by Andrew Rynhard
parent 08ee6c4fc9
commit 9de34cd7b6
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -26,6 +26,9 @@ WORKDIR /blockd
COPY ./internal/app/blockd/proto ./proto COPY ./internal/app/blockd/proto ./proto
RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto RUN protoc -I/usr/local/include -I./proto --go_out=plugins=grpc:proto proto/api.proto
ARG GOLANG_VERSION
FROM golang:${GOLANG_VERSION}-alpine AS golang-musl
# The base target provides a common starting point for all other targets. # The base target provides a common starting point for all other targets.
ARG TOOLCHAIN_IMAGE ARG TOOLCHAIN_IMAGE
@ -49,17 +52,12 @@ RUN make install DESTDIR=/rootfs
RUN cp /toolchain/lib/libblkid.* /rootfs/lib RUN cp /toolchain/lib/libblkid.* /rootfs/lib
# libuuid # libuuid
RUN cp /toolchain/lib/libuuid.* /rootfs/lib RUN cp /toolchain/lib/libuuid.* /rootfs/lib
# gcompat
WORKDIR /tmp/gcompat
RUN curl -L https://github.com/AdelieLinux/gcompat/archive/0.3.0.tar.gz | tar -xz --strip-components=1
RUN make LINKER_PATH=/lib/ld-musl-x86_64.so.1 LOADER_NAME=ld-linux-x86-64.so.2
RUN make LINKER_PATH=/lib/ld-musl-x86_64.so.1 LOADER_NAME=ld-linux-x86-64.so.2 install
# golang # golang
ENV GOROOT /toolchain/usr/local/go ENV GOROOT /toolchain/usr/local/go
ENV GOPATH /toolchain/go ENV GOPATH /toolchain/go
COPY --from=golang-musl /usr/local/go ${GOROOT}
ENV PATH ${PATH}:${GOROOT}/bin ENV PATH ${PATH}:${GOROOT}/bin
RUN mkdir -p ${GOROOT} ${GOPATH} RUN mkdir -p ${GOPATH}
RUN curl -L https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz | tar -xz --strip-components=1 -C ${GOROOT}
RUN ln -s lib /lib64 RUN ln -s lib /lib64
# context # context
ENV GO111MODULE on ENV GO111MODULE on

2
Makefile
View File

@ -5,7 +5,7 @@ PUSH = $(shell gitmeta pushable)
VPATH = $(PATH) VPATH = $(PATH)
KERNEL_IMAGE ?= autonomy/kernel:e8147aa KERNEL_IMAGE ?= autonomy/kernel:e8147aa
TOOLCHAIN_IMAGE ?= autonomy/toolchain:1cad5fc TOOLCHAIN_IMAGE ?= autonomy/toolchain:80f91fd
GOLANG_VERSION ?= 1.11.4 GOLANG_VERSION ?= 1.11.4
DOCKER_ARGS ?= DOCKER_ARGS ?=
BUILDKIT_VERSION ?= v0.3.3 BUILDKIT_VERSION ?= v0.3.3