Skip to content

Commit

Permalink
release fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
BuckarooBanzay committed Jan 5, 2021
1 parent c1236ab commit 7338ffc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $(OUT_DIR)/mapserver-linux-x86_64: $(OUT_DIR)

$(OUT_DIR)/mapserver-linux-x86: $(OUT_DIR)
# apt install gcc-8-i686-linux-gnu
GOOS=linux GOARCH=386 CC=i686-linux-gnu-gcc-7 $(GO_BUILD) $(GO_LDFLAGS) -o $@
GOOS=linux GOARCH=386 CC=i686-linux-gnu-gcc $(GO_BUILD) $(GO_LDFLAGS) -o $@

$(OUT_DIR)/mapserver-windows-x86.exe: $(OUT_DIR)
# apt install gcc-mingw-w64
Expand All @@ -60,7 +60,7 @@ $(OUT_DIR)/mapserver-windows-x86-64.exe: $(OUT_DIR)

$(OUT_DIR)/mapserver-linux-arm: $(OUT_DIR)
# apt install gcc-5-arm-linux-gnueabihf
GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc-5 $(GO_BUILD) $(GO_LDFLAGS) -o $@
GOARCH=arm GOARM=7 CC=arm-linux-gnueabihf-gcc-8 $(GO_BUILD) $(GO_LDFLAGS) -o $@


release: builder_image $(OUT_DIR) $(MOD_ZIP)
Expand Down
22 changes: 11 additions & 11 deletions docker_builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM ubuntu:bionic
FROM ubuntu:focal

# cross compile stuff
RUN apt-get update &&\
apt-get install -y gcc-mingw-w64 gcc-5-arm-linux-gnueabihf gcc-i686-linux-gnu &&\
apt-get install -y software-properties-common git
# for tzdata
ENV DEBIAN_FRONTEND=noninteractive

# go stuff
RUN add-apt-repository ppa:longsleep/golang-backports &&\
apt-get update &&\
apt-get install -y golang-go
RUN apt-get update

# cross compile and go stuff
RUN apt-get install -y gcc-mingw-w64 gcc-8-arm-linux-gnueabihf gcc-i686-linux-gnu &&\
apt-get install -y software-properties-common git golang-go

# TODO: move this to a separate package.json and docker container
# jshint
RUN apt-get install -y nodejs npm
RUN npm install -g jshint
RUN npm install -g jshint@2.12.0

# rollup
RUN npm install -g rollup
RUN npm install -g rollup@2.35.1

0 comments on commit 7338ffc

Please sign in to comment.