Adding build in docker with make

Adding docker.Makefile that simplifies building the code in docker

Signed-off-by: Nick Adcock <[email protected]>

Author: zappy-shu

.github/workflows/main.yml

@@ -10,6 +10,4 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Build
-      run: docker build -t docker/github-actions .
-      env:
-        BUILDKIT_PROGRESS: plain
+      run: make -f docker.Makefile

.gitignore

@@ -1 +1 @@
-github-actions
+bin/

Dockerfile

@@ -17,8 +17,13 @@ RUN make ${MAKE_TARGET}
 
 
 
+FROM scratch AS cli
+COPY --from=builder /src/bin/github-actions github-actions
+
+
+
 FROM alpine:${ALPINE_VERSION}
 
-COPY --from=builder /src/github-actions /github-actions
+COPY --from=builder /src/bin/github-actions /github-actions
 
-ENTRYPOINT ["/github-actions"]
+ENTRYPOINT ["/github-actions"]

Makefile

@@ -1,7 +1,8 @@
 all: build lint test
 
 build:
-	go build -o github-actions ./cmd
+	@$(call mkdir,bin)
+	go build -o bin/github-actions ./cmd
 
 lint:
 	golangci-lint run --config golangci.yml ./...

README.md

@@ -1,2 +1,16 @@
 # github-actions
-Core code for all Docker's github actions
+The core code base for Docker's GitHub Actions (https://github.com/features/actions). This code is used to build the docker/github-actions image that provides the functionality used by the published Docker GitHub Actions
+
+
+## Building github-actions
+The code is written in Go v1.13 with `go mod`. It can be built locally using the `Makefile` or in docker using the `docker.Makefile`.
+
+`make -f docker.Makefile` will build the code, check the linting using golangci-lint, run the go tests, and build the image with a tag of docker/github-actions:latest
+
+`make -f docker.Makefile TAG=foo` will build the code, check the linting using golangci-lint, run the go tests, and build the image with a tag of docker/github-actions:foo
+
+`make -f docker.Makefile image` will build the github-actions image without a tag and without running test or lint checking
+
+`make -f docker.Makefile cli` will build the cli and copy it to `./bin/github-actions`
+
+`make -f docker.Makefile test` will run the go tests

docker.Makefile

@@ -0,0 +1,19 @@
+TAG ?= latest
+STATIC_FLAGS = BUILDKIT_PROGRESS=plain
+DOCKER_BUILD = $(STATIC_FLAGS) docker build
+
+all:
+	$(DOCKER_BUILD) -t docker/github-actions:$(TAG) .
+
+image:
+	$(DOCKER_BUILD) -t docker/github-actions:$(TAG) --build-arg MAKE_TARGET=build .
+
+cli:
+	@$(call mkdir,bin)
+	$(DOCKER_BUILD) -t github-actions-cli --target=cli --output type=local,dest=./bin/ --build-arg MAKE_TARGET=build .
+
+lint:
+	$(DOCKER_BUILD) -t github-actions-lint --build-arg MAKE_TARGET=lint .
+
+test:
+	$(DOCKER_BUILD) -t github-actions-test --build-arg MAKE_TARGET=test .