Skip to content

Commit

Permalink
Dockerfile,Makefile: Use debian stretch over alpine
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Jung <a.jung@lancs.ac.uk>
  • Loading branch information
nderjung committed Dec 20, 2020
1 parent 3e55044 commit fe6a9fb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,18 @@
# POSSIBILITY OF SUCH DAMAGE.

ARG GO_VERSION=1.14
ARG ALPINE_VERSION=3.12

FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS base
FROM golang:${GO_VERSION}-stretch AS base

ARG ORG=lancs-net
ARG BIN=ukbench

RUN set -xe; \
apk --no-cache add \
apt-get update; \
apt-get install -y --no-install-recommends \
build-essential \
make \
git
git;

COPY . /go/src/github.com/${ORG}/${BIN}
WORKDIR /go/src/github.com/${ORG}/${BIN}
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,12 @@ $(.PROXY)build:

# Create an environment where we can build
.PHONY: container
container: ALPINE_VERSION ?= 3.12
container: GO_VERSION ?= 1.14
container: DOCKER_BUILD_EXTRA ?=
container:
$(DOCKER) build \
--build-arg ORG=$(ORG) \
--build-arg BIN=$(BIN) \
--build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
--build-arg GO_VERSION=$(GO_VERSION) \
--tag $(IMAGE) \
$(DOCKER_BUILD_EXTRA) $(WORKDIR)
Expand Down

0 comments on commit fe6a9fb

Please sign in to comment.