alpine build step

This commit is contained in:
Thomas Rudin 2019-11-28 19:46:11 +01:00
parent 6bc8148c0e
commit 0a276b45e7
2 changed files with 3 additions and 7 deletions

View File

@ -1,10 +1,6 @@
FROM ubuntu as builder
FROM golang:1.13-alpine as builder
RUN apt-get update &&\
apt-get install -y software-properties-common git &&\
add-apt-repository ppa:longsleep/golang-backports &&\
apt-get update &&\
apt-get install -y golang-go npm nodejs git
RUN apk --no-cache add ca-certificates gcc libc-dev nodejs npm git make
VOLUME /root/go
COPY ./ /server

View File

@ -45,7 +45,7 @@ $(STATIC_VFS): $(JS_BUNDLE)
$(OUT_DIR)/mapserver-linux-x86_64: $(OUT_DIR)
# native (linux x86_64)
GOOS=linux GOARCH=amd64 CC=x86_64-linux-gnu-gcc $(GO_BUILD) $(GO_LDFLAGS) -o $@
GOOS=linux GOARCH=amd64 CC=gcc $(GO_BUILD) $(GO_LDFLAGS) -o $@
$(OUT_DIR)/mapserver-linux-x86: $(OUT_DIR)
# apt install gcc-8-i686-linux-gnu