fix(ci): re-add loki-docker-driver

grafana · Jul 30, 2019 · 6d2e7cb · 6d2e7cb
1 parent 2cebc49
commit 6d2e7cb
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,19 +1,21 @@
 version: 2
 
-.tags: &tags
+.tags: &tags # tags need to be explicitely defined (whitelist)
   tags: {only: "/.*/"}
 
 .tag-or-master: &tag-or-master
   branches: { only: master }
   <<: *tags
 
-.no-master: &no-master
+.no-master: &no-master # contrary to tags, the branches must be excluded (blacklist)
   branches: { ignore: master }
 
 workflows:
   version: 2
   containers:
     jobs:
+      # publish jobs depend on this as well,
+      # thus tags need to be allowed for these
       - lint: {filters: {<<: *tags}}
       - test: {filters: {<<: *tags}}
 
@@ -37,6 +39,13 @@ workflows:
       - publish/promtail:
           requires: [ lint, test ]
           filters: { <<: *tag-or-master }
+
+      - build/docker-driver:
+          requires: [ lint, test ]
+          filters: {<<: *no-master}
+      - publish/docker-driver:
+          requires: [ lint, test ]
+          filters: { <<: *tag-or-master }
 
       - test-helm:
           requires: [ lint, test ]
@@ -158,6 +167,28 @@ jobs:
     environment:
       APP: promtail
 
+  # Docker driver
+  build/docker-driver:
+    <<: *defaults
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: docker-driver
+          command: make docker-driver
+
+  publish/docker-driver:
+    <<: *defaults
+    steps:
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: login
+          command: docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
+      - run:
+          name: docker-driver
+          command: make docker-driver-push
+
   test-helm:
     environment:
       CT_VERSION: 2.3.3

diff --git a/Makefile b/Makefile
@@ -282,9 +282,9 @@ helm-clean:
 
 PLUGIN_TAG ?= $(IMAGE_TAG)
 
-docker-driver: docker-driver-clean cmd/docker-driver/docker-driver
+docker-driver: docker-driver-clean 
 	mkdir cmd/docker-driver/rootfs
-	docker build -t rootfsimage cmd/docker-driver
+	docker build -t rootfsimage -f cmd/docker-driver/Dockerfile .
 	ID=$$(docker create rootfsimage true) && \
 	(docker export $$ID | tar -x -C cmd/docker-driver/rootfs) && \
 	docker rm -vf $$ID

diff --git a/cmd/docker-driver/Dockerfile b/cmd/docker-driver/Dockerfile
@@ -1,5 +1,23 @@
-FROM       alpine:3.9
-RUN        apk add --update --no-cache ca-certificates
-COPY       docker-driver /bin/docker-driver
+# Directories in this file are referenced from the root of the project not this folder
+# This file is intented to be called from the root like so:
+# docker build -t grafana/loki -f cmd/loki/Dockerfile .
+
+# TODO: really add cross-platform support
+
+# FROM golang:1.11.4-alpine as goenv
+# RUN go env GOARCH > /goarch && \
+#   go env GOARM > /goarm
+
+# FROM --platform=linux/amd64 grafana/loki-build-image as build
+FROM grafana/loki-build-image as build
+# COPY --from=goenv /goarch /goarm /
+COPY . /go/src/github.com/grafana/loki
+WORKDIR /go/src/github.com/grafana/loki
+# RUN GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make clean && make cmd/docker-driver/docker-driver
+RUN make clean && make cmd/docker-driver/docker-driver
+
+FROM alpine:3.9
+RUN apk add --update --no-cache ca-certificates
+COPY --from=build /go/src/github.com/grafana/loki/cmd/docker-driver/docker-driver /bin/docker-driver
 WORKDIR /bin/
-ENTRYPOINT [ "/bin/docker-driver" ]
+ENTRYPOINT [ "/bin/docker-driver" ]