docker: test makefile and Dockerfile change (#4866)
The fix in 4b9bc138d9
breaks docker with
~~~
Step 2/9 : RUN sed -i.bak s@stable/update@stable-security/update@g /etc/apt/sources.list
---> Running in 29a0dbae5746
no status provided on response: unknown
~~~
So reverted here. This adds github workflows to test Makefile.docker
syntax as well. And small updates to the docker-coredns over in the
release repo.
Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
parent
033c341517
commit
6496b19ea4
3 changed files with 6 additions and 4 deletions
7
.github/workflows/go.test.yml
vendored
7
.github/workflows/go.test.yml
vendored
|
@ -78,5 +78,8 @@ jobs:
|
|||
- name: Check out code
|
||||
uses: actions/checkout@v2
|
||||
|
||||
- name: Test Makefile
|
||||
run: make GITHUB_ACCESS_TOKEN=bla -n build github-push -f Makefile.release
|
||||
- name: Test Makefile.release
|
||||
run: make GITHUB_ACCESS_TOKEN=x -n release github-push -f Makefile.release
|
||||
|
||||
- name: Test Makefile.docker
|
||||
run: make VERSION=x DOCKER=x -n release docker-push -f Makefile.docker
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
FROM debian:stable-slim
|
||||
|
||||
RUN sed -i.bak s@stable/update@stable-security/update@g /etc/apt/sources.list
|
||||
RUN apt-get update && apt-get -uy upgrade
|
||||
RUN apt-get -y install ca-certificates && update-ca-certificates
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ else
|
|||
@# 1. Copy appropriate coredns binary to build/docker/linux/<arch>
|
||||
@# 2. Copy Dockerfile to build/docker/linux/<arch>
|
||||
for arch in $(LINUX_ARCH); do \
|
||||
docker build -t $(DOCKER_IMAGE_NAME)-$${arch}:$(VERSION) build/docker/linux/$${arch} ;\
|
||||
docker build -t $(DOCKER_IMAGE_NAME)-$${arch}:$(VERSION) build/docker/$${arch} && \
|
||||
docker tag $(DOCKER_IMAGE_NAME)-$${arch}:$(VERSION) $(DOCKER_IMAGE_NAME)-$${arch}:latest ;\
|
||||
done
|
||||
endif
|
||||
|
|
Loading…
Add table
Reference in a new issue