chore: refactor docker images

berty · Oct 15, 2018 · 4319101 · 4319101
1 parent 49a2140
commit 4319101
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
   lint:
     <<: *golang_workspace
     docker:
-      - image: bertychat/linter:latest
+      - image: bertychat/linter:v2
     steps:
       - checkout
       - restore_cache:
@@ -201,7 +201,7 @@ jobs:
   client.rn.android:
     working_directory: ~/go/src/berty.tech/client/react-native/mobile/android
     docker:
-      - image: bertychat/android-ci:latest
+      - image: bertychat/android-ci:v2
     steps:
       - checkout:
           path: ~/go/src/berty.tech/

diff --git a/.circleci/docker/Makefile b/.circleci/docker/Makefile
diff --git a/.circleci/docker/Dockerfile.android-ci → build/docker/android-ci/Dockerfile b/.circleci/docker/Dockerfile.android-ci → build/docker/android-ci/Dockerfile
diff --git a/build/docker/android-ci/Makefile b/build/docker/android-ci/Makefile
@@ -0,0 +1,7 @@
+IMAGE ?= bertychat/android-ci:v2
+
+build:
+	docker build --pull -t $(IMAGE) .
+
+release: build
+	docker push $(IMAGE)
diff --git a/.circleci/docker/gomobile-env-flag.diff → .../docker/android-ci/gomobile-env-flag.diff b/.circleci/docker/gomobile-env-flag.diff → .../docker/android-ci/gomobile-env-flag.diff
diff --git a/.circleci/docker/Dockerfile.linter → build/docker/linter/Dockerfile b/.circleci/docker/Dockerfile.linter → build/docker/linter/Dockerfile
diff --git a/build/docker/linter/Makefile b/build/docker/linter/Makefile
@@ -0,0 +1,7 @@
+IMAGE ?= bertychat/linter:v2
+
+build:
+	docker build --pull -t $(IMAGE) .
+
+release: build
+	docker push $(IMAGE)
diff --git a/.circleci/docker/Dockerfile.protoc → build/docker/protoc/Dockerfile b/.circleci/docker/Dockerfile.protoc → build/docker/protoc/Dockerfile
@@ -1,8 +1,8 @@
-FROM moul/protoc-gen-gotemplate as pgg
+FROM moul/protoc-gen-gotemplate:latest as pgg
 
 FROM    golang:1.11-alpine as builder
 
-RUN     apk --update add make git go rsync libc-dev openssh docker
+RUN     apk --no-cache add make git go rsync libc-dev openssh docker
 
 RUN     go get -u -v \
         github.com/gogo/protobuf/proto \
@@ -20,7 +20,7 @@ RUN     cd /go/src/github.com/99designs/gqlgen && git checkout v0.6.0 && go inst
 RUN     rm -f /go/bin/web-editor
 
 FROM    golang:1.11-alpine
-RUN     apk --update add git make protobuf gcc libc-dev && mkdir -p /.cache/go-build && chmod -R 777 /.cache
+RUN     apk --no-cache add git make protobuf gcc libc-dev && mkdir -p /.cache/go-build && chmod -R 777 /.cache
 COPY    --from=pgg /go/bin/* /go/bin/
 COPY    --from=builder /go/bin/* /go/bin/
 COPY    --from=pgg /protobuf /protobuf

diff --git a/build/docker/protoc/Makefile b/build/docker/protoc/Makefile
@@ -0,0 +1,7 @@
+IMAGE ?= bertychat/protoc:v3
+
+build:
+	docker build --pull -t $(IMAGE) .
+
+release: build
+	docker push $(IMAGE)
diff --git a/client/react-native/gomobile/Makefile b/client/react-native/gomobile/Makefile
@@ -3,7 +3,7 @@ PWD :=			$(shell pwd)
 CORE_PACKAGE :=		$(PWD)/../../../core
 CORE_SOURCES :=		$(shell find $(CORE_PACKAGE) -type f -name "*.go") \
 			$(shell find . -type f -name "*.go")
-BUILD_PATCH_PATH :=	$(PWD)/../../../.circleci/docker
+BUILD_PATCH_PATH :=	$(PWD)/../../../build/docker/android-ci
 
 GOPATH ?=		$(HOME)/go