devops: use dockerignore

Signed-off-by: Login Victor <batazor111@gmail.com>
shortlink-org · May 20, 2021 · 913c7bc · 913c7bc
1 parent 7dc222d
commit 913c7bc
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 10 deletions.
diff --git a/ops/Makefile/docker.mk b/ops/Makefile/docker.mk
@@ -3,6 +3,7 @@
 # including docker.mk
 CI_REGISTRY_IMAGE := batazor/${PROJECT_NAME}
 CI_COMMIT_TAG := latest
+DOCKER_BUILDKIT := 1
 
 docker: docker-login docker-build docker-push ## docker login > build > push
 
@@ -11,16 +12,9 @@ docker-login: ## Docker login
 	@echo ${DOCKER_PASSWORD} | docker login -u ${DOCKER_USERNAME} --password-stdin
 
 docker-build: ## Build the container
-	@echo docker build image ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}
-	@docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -f ops/dockerfile/api.Dockerfile .
-
-	@echo docker build image ${CI_REGISTRY_IMAGE}-logger:${CI_COMMIT_TAG}
-	@docker build -t ${CI_REGISTRY_IMAGE}-logger:${CI_COMMIT_TAG} -f ops/dockerfile/logger.Dockerfile .
-
-	@echo docker build image ${CI_REGISTRY_IMAGE}-ui-next:${CI_COMMIT_TAG}
+	@docker build -t ${CI_REGISTRY_IMAGE}-api:${CI_COMMIT_TAG}     -f ops/dockerfile/api.Dockerfile .
+	@docker build -t ${CI_REGISTRY_IMAGE}-logger:${CI_COMMIT_TAG}  -f ops/dockerfile/logger.Dockerfile .
 	@docker build -t ${CI_REGISTRY_IMAGE}-ui-next:${CI_COMMIT_TAG} -f ops/dockerfile/ui-next.Dockerfile .
-
-	@echo docker build image ${CI_REGISTRY_IMAGE}-landing:${CI_COMMIT_TAG}
 	@docker build -t ${CI_REGISTRY_IMAGE}-landing:${CI_COMMIT_TAG} -f ops/dockerfile/landing.Dockerfile .
 
 docker-push: ## Publish the container

diff --git a/ops/dockerfile/api.Dockerfile.dockerignore b/ops/dockerfile/api.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/auth.Dockerfile.dockerignore b/ops/dockerfile/auth.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/bot.Dockerfile.dockerignore b/ops/dockerfile/bot.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/csi.Dockerfile.dockerignore b/ops/dockerfile/csi.Dockerfile.dockerignore
@@ -0,0 +1,14 @@
+.*
+danger
+docs
+internal
+ops
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/landing.Dockerfile b/ops/dockerfile/landing.Dockerfile
@@ -8,7 +8,7 @@ RUN apk add --no-cache alpine-sdk python3 libsass \
 WORKDIR /app
 COPY ./ui/landing /app/
 
-RUN npm i && \
+RUN npm i --force && \
   npm rebuild node-sass && \
   npm run generate
 

diff --git a/ops/dockerfile/landing.Dockerfile.dockerignore b/ops/dockerfile/landing.Dockerfile.dockerignore
@@ -0,0 +1,14 @@
+.*
+cmd
+danger
+docs
+internal
+ops
+pkg
+third_party
+ui
+*.yml
+
+!ui/landing
+!ops/dockerfile/conf/landing.local
+!ops/docker-compose/gateway/nginx
diff --git a/ops/dockerfile/link.Dockerfile.dockerignore b/ops/dockerfile/link.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/logger.Dockerfile.dockerignore b/ops/dockerfile/logger.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/metadata.Dockerfile.dockerignore b/ops/dockerfile/metadata.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/notify.Dockerfile.dockerignore b/ops/dockerfile/notify.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/proxy.Dockerfile.dockerignore b/ops/dockerfile/proxy.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal
diff --git a/ops/dockerfile/ui-next.Dockerfile.dockerignore b/ops/dockerfile/ui-next.Dockerfile.dockerignore
@@ -0,0 +1,15 @@
+.*
+danger
+docs
+internal
+ops
+pkg/csi
+pkg/flutter
+pkg/ml
+third_party
+ui
+*.yml
+
+!vendor
+!pkg
+!internal