Remove base docker image (#995)

* fix: remove base image dependencies from several image Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com> * fix: remove base image dependencies and remove base image Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com> * fix: remove base build workflow from github actions Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com> * fix: remove base image build task from makefile Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com> * fix: remove base image dependencies from deepsource Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com> * Update dockers/dev/Dockerfile Co-authored-by: Rintaro Okamura <rintaro.okamura@gmail.com> * fix: build fails for ci container. so I added go.mod and go.sum Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com> * fix: set WORKDIR via variable Signed-off-by: hlts2 <hiroto.funakoshi.hiroto@gmail.com> Co-authored-by: Rintaro Okamura <rintaro.okamura@gmail.com>
vdaas · Feb 9, 2021 · ca55ac1 · ca55ac1
1 parent ca55f25
commit ca55ac1
Show file tree

Hide file tree

Showing 40 changed files with 347 additions and 247 deletions.
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -37,7 +37,6 @@ enabled = true
 
   [analyzers.meta]
   dockerfile_paths = [
-    "dockers/base/Dockerfile",
     "dockers/agent/ngt/Dockerfile",
     "dockers/discoverer/k8s/Dockerfile",
     "dockers/gateway/vald/Dockerfile",

diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml
@@ -33,7 +33,6 @@ on:
       - "apis/grpc/**"
       - "pkg/agent/core/ngt/**"
       - "cmd/agent/core/ngt/**"
-      - "dockers/base/Dockerfile"
       - "dockers/agent/core/ngt/Dockerfile"
       - "versions/GO_VERSION"
       - "versions/NGT_VERSION"
@@ -48,8 +47,6 @@ on:
       - "apis/grpc/**"
       - "pkg/agent/core/ngt/**"
       - "cmd/agent/core/ngt/**"
-      - "dockers/base/Dockerfile"
-      - "dockers/agent/core/ngt/Dockerfile"
       - "versions/GO_VERSION"
       - "versions/NGT_VERSION"
 

diff --git a/.github/workflows/dockers-agent-sidecar-image.yml b/.github/workflows/dockers-agent-sidecar-image.yml
@@ -34,7 +34,6 @@ on:
       - "apis/grpc/**"
       - "pkg/agent/sidecar/**"
       - "cmd/agent/sidecar/**"
-      - "dockers/base/Dockerfile"
       - "dockers/agent/sidecar/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -49,7 +48,6 @@ on:
       - "apis/grpc/**"
       - "pkg/agent/sidecar/**"
       - "cmd/agent/sidecar/**"
-      - "dockers/base/Dockerfile"
       - "dockers/agent/sidecar/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-backup-manager-cassandra-image.yml b/.github/workflows/dockers-backup-manager-cassandra-image.yml
@@ -34,7 +34,6 @@ on:
       - "apis/grpc/**"
       - "pkg/manager/backup/cassandra/**"
       - "cmd/manager/backup/cassandra/**"
-      - "dockers/base/Dockerfile"
       - "dockers/manager/backup/cassandra/Dockerfile"
       - "versions/GO_VERSION"
       - "versions/NGT_VERSION"
@@ -50,7 +49,6 @@ on:
       - "apis/grpc/**"
       - "pkg/manager/backup/cassandra/**"
       - "cmd/manager/backup/cassandra/**"
-      - "dockers/base/Dockerfile"
       - "dockers/manager/backup/cassandra/Dockerfile"
       - "versions/GO_VERSION"
       - "versions/NGT_VERSION"

diff --git a/.github/workflows/dockers-backup-manager-mysql-image.yml b/.github/workflows/dockers-backup-manager-mysql-image.yml
@@ -34,7 +34,6 @@ on:
       - "apis/grpc/**"
       - "pkg/manager/backup/mysql/**"
       - "cmd/manager/backup/mysql/**"
-      - "dockers/base/Dockerfile"
       - "dockers/manager/backup/mysql/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -49,7 +48,6 @@ on:
       - "apis/grpc/**"
       - "pkg/manager/backup/mysql/**"
       - "cmd/manager/backup/mysql/**"
-      - "dockers/base/Dockerfile"
       - "dockers/manager/backup/mysql/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-base-image.yml b/.github/workflows/dockers-base-image.yml
diff --git a/.github/workflows/dockers-discoverer-k8s-image.yml b/.github/workflows/dockers-discoverer-k8s-image.yml
@@ -32,7 +32,6 @@ on:
       - "apis/grpc/**"
       - "pkg/discoverer/k8s/**"
       - "cmd/discoverer/k8s/**"
-      - "dockers/base/Dockerfile"
       - "dockers/discoverer/k8s/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -45,7 +44,6 @@ on:
       - "apis/grpc/**"
       - "pkg/discoverer/k8s/**"
       - "cmd/discoverer/k8s/**"
-      - "dockers/base/Dockerfile"
       - "dockers/discoverer/k8s/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-gateway-backup-image.yml b/.github/workflows/dockers-gateway-backup-image.yml
@@ -35,7 +35,6 @@ on:
       - "pkg/gateway/backup/**"
       - "cmd/gateway/backup/**"
       - "pkg/gateway/internal/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/backup/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -51,7 +50,6 @@ on:
       - "pkg/gateway/backup/**"
       - "cmd/gateway/backup/**"
       - "pkg/gateway/internal/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/backup/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-gateway-filter-image.yml b/.github/workflows/dockers-gateway-filter-image.yml
@@ -35,7 +35,6 @@ on:
       - "pkg/gateway/filter/**"
       - "cmd/gateway/filter/**"
       - "pkg/gateway/internal/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/filter/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -51,7 +50,6 @@ on:
       - "pkg/gateway/filter/**"
       - "cmd/gateway/filter/**"
       - "pkg/gateway/internal/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/filter/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-gateway-lb-image.yml b/.github/workflows/dockers-gateway-lb-image.yml
@@ -35,7 +35,6 @@ on:
       - "pkg/gateway/lb/**"
       - "cmd/gateway/lb/**"
       - "pkg/gateway/internal/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/lb/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -51,7 +50,6 @@ on:
       - "pkg/gateway/lb/**"
       - "cmd/gateway/lb/**"
       - "pkg/gateway/internal/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/lb/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-gateway-meta-image.yml b/.github/workflows/dockers-gateway-meta-image.yml
@@ -35,7 +35,6 @@ on:
       - "pkg/gateway/meta/**"
       - "cmd/gateway/meta/**"
       - "pkg/gateway/internal/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/meta/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -51,7 +50,6 @@ on:
       - "pkg/gateway/meta/**"
       - "cmd/gateway/meta/**"
       - "pkg/gateway/internal/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/meta/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-gateway-vald-image.yml b/.github/workflows/dockers-gateway-vald-image.yml
@@ -33,7 +33,6 @@ on:
       - "apis/grpc/**"
       - "pkg/gateway/vald/**"
       - "cmd/gateway/vald/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/vald/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -47,7 +46,6 @@ on:
       - "apis/grpc/**"
       - "pkg/gateway/vald/**"
       - "cmd/gateway/vald/**"
-      - "dockers/base/Dockerfile"
       - "dockers/gateway/vald/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-loadtest-image.yml b/.github/workflows/dockers-loadtest-image.yml
@@ -33,7 +33,6 @@ on:
       - "apis/grpc/**"
       - "pkg/tools/cli/loadtest/**"
       - "cmd/tools/cli/loadtest/**"
-      - "dockers/base/Dockerfile"
       - "dockers/tools/cli/loadtest/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -47,7 +46,6 @@ on:
       - "apis/grpc/**"
       - "pkg/tools/cli/loadtest/**"
       - "cmd/tools/cli/loadtest/**"
-      - "dockers/base/Dockerfile"
       - "dockers/tools/cli/loadtest/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-manager-compressor-image.yml b/.github/workflows/dockers-manager-compressor-image.yml
@@ -33,7 +33,6 @@ on:
       - "apis/grpc/**"
       - "pkg/manager/compressor/**"
       - "cmd/manager/compressor/**"
-      - "dockers/base/Dockerfile"
       - "dockers/manager/compressor/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -47,7 +46,6 @@ on:
       - "apis/grpc/**"
       - "pkg/manager/compressor/**"
       - "cmd/manager/compressor/**"
-      - "dockers/base/Dockerfile"
       - "dockers/manager/compressor/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-manager-index-image.yml b/.github/workflows/dockers-manager-index-image.yml
@@ -33,7 +33,6 @@ on:
       - "apis/grpc/**"
       - "pkg/manager/index/**"
       - "cmd/manager/index/**"
-      - "dockers/base/Dockerfile"
       - "dockers/manager/index/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -47,7 +46,6 @@ on:
       - "apis/grpc/**"
       - "pkg/manager/index/**"
       - "cmd/manager/index/**"
-      - "dockers/base/Dockerfile"
       - "dockers/manager/index/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-meta-cassandra-image.yml b/.github/workflows/dockers-meta-cassandra-image.yml
@@ -34,7 +34,6 @@ on:
       - "apis/grpc/**"
       - "pkg/meta/cassandra/**"
       - "cmd/meta/cassandra/**"
-      - "dockers/base/Dockerfile"
       - "dockers/meta/cassandra/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -49,7 +48,6 @@ on:
       - "apis/grpc/**"
       - "pkg/meta/cassandra/**"
       - "cmd/meta/cassandra/**"
-      - "dockers/base/Dockerfile"
       - "dockers/meta/cassandra/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/.github/workflows/dockers-meta-redis-image.yml b/.github/workflows/dockers-meta-redis-image.yml
@@ -34,7 +34,6 @@ on:
       - "apis/grpc/**"
       - "pkg/meta/redis/**"
       - "cmd/meta/redis/**"
-      - "dockers/base/Dockerfile"
       - "dockers/meta/redis/Dockerfile"
       - "versions/GO_VERSION"
   pull_request:
@@ -49,7 +48,6 @@ on:
       - "apis/grpc/**"
       - "pkg/meta/redis/**"
       - "cmd/meta/redis/**"
-      - "dockers/base/Dockerfile"
       - "dockers/meta/redis/Dockerfile"
       - "versions/GO_VERSION"
 

diff --git a/Makefile b/Makefile
@@ -20,7 +20,6 @@ GOPKG                           = github.com/$(ORG)/$(NAME)
 GOPRIVATE                       = $(GOPKG),$(GOPKG)/apis
 DATETIME                        = $(eval DATETIME := $(shell date -u +%Y/%m/%d_%H:%M:%S%z))$(DATETIME)
 TAG                            ?= latest
-BASE_IMAGE                      = $(NAME)-base
 AGENT_IMAGE                     = $(NAME)-agent-ngt
 AGENT_SIDECAR_IMAGE             = $(NAME)-agent-sidecar
 BACKUP_GATEWAY_IMAGE            = $(NAME)-backup-gateway

diff --git a/Makefile.d/docker.mk b/Makefile.d/docker.mk
@@ -16,7 +16,6 @@
 .PHONY: docker/build
 ## build all docker images
 docker/build: \
-	docker/build/base \
 	docker/build/agent-ngt \
 	docker/build/agent-sidecar \
 	docker/build/discoverer-k8s \
@@ -45,20 +44,6 @@ docker/name/org/alter:
 docker/platforms:
 	@echo "linux/amd64,linux/arm64"
 
-.PHONY: docker/name/base
-docker/name/base:
-	@echo "$(ORG)/$(BASE_IMAGE)"
-
-.PHONY: docker/build/base
-## build base image
-docker/build/base:
-	$(DOCKER) build \
-	    $(DOCKER_OPTS) \
-	    -f dockers/base/Dockerfile \
-	    -t $(ORG)/$(BASE_IMAGE):$(TAG) . \
-	    --build-arg MAINTAINER=$(MAINTAINER) \
-	    --build-arg GO_VERSION=$(GO_VERSION)
-
 .PHONY: docker/name/agent-ngt
 docker/name/agent-ngt:
 	@echo "$(ORG)/$(AGENT_IMAGE)"