Skip to content

Commit bdfe3b6

Browse files
committed
Enable docker containers to be built with Git Sha
1 parent d0063b1 commit bdfe3b6

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.git/

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
FROM golang:latest AS builder
2+
ARG GIT_REVISION
23
WORKDIR /app
34
COPY go.sum .
45
COPY go.mod .
56
RUN go mod download
67
COPY . .
7-
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o server cmd/web/web.go
8+
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X github.com/go-franky/plain_http/version.GitRevision=$GIT_REVISION" -o server cmd/web/web.go
89

910
FROM alpine
1011
RUN apk --no-cache add ca-certificates curl

Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@ windows:
3535
GOOS=windows GOARCH=${GOARCH} go build ${LDFLAGS} -o ${BINARY}-windows-${GOARCH}.exe cmd/web/web.go ; \
3636
cd - >/dev/null
3737

38-
.PHONY: default linux darwin windows test vet fmt clean
38+
docker:
39+
docker build -t plain_http --build-arg GIT_REVISION=${COMMIT} .
40+
41+
.PHONY: default linux darwin windows test vet fmt clean docker

docker-compose.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
version: "3.7"
22
services:
33
app:
4-
build: .
4+
build:
5+
context: .
6+
args:
7+
GIT_REVISION: ''
58
ports:
69
- 8080:8080

0 commit comments

Comments
 (0)