use single Dockerfile for both docker-machine and gitlab-runner images

Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>

Author: Adphi

Dockerfile

@@ -1,3 +1,7 @@
+# renovate: datasource=gitlab-tags depName=gitlab-org/gitlab-runner versioning=semver
+ARG GITLAB_RUNNER_VERSION=v16.9.1
+ARG GITLAB_RUNNER_IMAGE=gitlab/gitlab-runner:alpine-${GITLAB_RUNNER_VERSION}
+
 FROM golang:alpine
 
 WORKDIR /docker-machine-driver-scaleway
@@ -23,8 +27,14 @@ ARG DOCKER_MACHINE_VERSION=v0.16.2-gitlab.21
 RUN git clone --branch=${DOCKER_MACHINE_VERSION}  https://gitlab.com/gitlab-org/ci-cd/docker-machine .
 RUN CGO_ENABLED=0 GO111MODULE=off go build -o docker-machine -trimpath -ldflags="-s -w" ./cmd/docker-machine
 
+FROM ${GITLAB_RUNNER_IMAGE} as gitlab-runner
 
-FROM alpine
+COPY --from=0 /docker-machine-driver-scaleway/docker-machine-driver-scaleway /usr/local/bin/docker-machine-driver-scaleway-v2
+COPY --from=1 /go/src/github.com/docker/machine/docker-machine /usr/local/bin/docker-machine
+
+VOLUME /root/.docker/machine
+
+FROM alpine as docker-machine
 
 RUN apk add --no-cache ca-certificates
 
@@ -34,3 +44,4 @@ COPY --from=1 /go/src/github.com/docker/machine/docker-machine /usr/local/bin/do
 VOLUME /root/.docker/machine
 
 ENTRYPOINT ["docker-machine"]
+

Makefile

@@ -7,8 +7,8 @@ RUNNER_VERSION := v16.9.1
 docker: docker-build docker-push
 
 docker-build:
-	@docker build -t $(DOCKER_MACHINE_IMAGE) .
-	@docker build -t $(RUNNER_IMAGE):$(RUNNER_VERSION) -f gitlab-runner.Dockerfile .
+	@docker build --target docker-machine -t $(DOCKER_MACHINE_IMAGE) .
+	@docker build --target gitlab-runner -t $(RUNNER_IMAGE):$(RUNNER_VERSION) .
 docker-push:
 	@docker push $(DOCKER_MACHINE_IMAGE)
 	@docker push $(RUNNER_IMAGE):$(RUNNER_VERSION)