Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove base docker image #995

Merged
merged 9 commits into from
Feb 9, 2021
Merged

Remove base docker image #995

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0c83c3
fix: remove base image dependencies from several image
hlts2 Feb 9, 2021
61ded7b
fix: remove base image dependencies and remove base image
hlts2 Feb 9, 2021
b87222f
fix: remove base build workflow from github actions
hlts2 Feb 9, 2021
265bbbd
fix: remove base image build task from makefile
hlts2 Feb 9, 2021
498e4e9
fix: remove base image dependencies from deepsource
hlts2 Feb 9, 2021
d96f660
Update dockers/dev/Dockerfile
hlts2 Feb 9, 2021
91cbf62
fix: build fails for ci container. so I added go.mod and go.sum
hlts2 Feb 9, 2021
9b38ac3
Merge branch 'ci/docker/remove_base_docker_image' of https://github.c…
hlts2 Feb 9, 2021
4f872d9
fix: set WORKDIR via variable
hlts2 Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .deepsource.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/dockers-agent-ngt-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-agent-sidecar-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -49,7 +48,6 @@ on:
- "apis/grpc/**"
- "pkg/agent/sidecar/**"
- "cmd/agent/sidecar/**"
- "dockers/base/Dockerfile"
- "dockers/agent/sidecar/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-backup-manager-cassandra-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-backup-manager-mysql-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"

Expand Down
71 changes: 0 additions & 71 deletions .github/workflows/dockers-base-image.yml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/dockers-discoverer-k8s-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -45,7 +44,6 @@ on:
- "apis/grpc/**"
- "pkg/discoverer/k8s/**"
- "cmd/discoverer/k8s/**"
- "dockers/base/Dockerfile"
- "dockers/discoverer/k8s/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-gateway-backup-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -51,7 +50,6 @@ on:
- "pkg/gateway/backup/**"
- "cmd/gateway/backup/**"
- "pkg/gateway/internal/**"
- "dockers/base/Dockerfile"
- "dockers/gateway/backup/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-gateway-filter-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -51,7 +50,6 @@ on:
- "pkg/gateway/filter/**"
- "cmd/gateway/filter/**"
- "pkg/gateway/internal/**"
- "dockers/base/Dockerfile"
- "dockers/gateway/filter/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-gateway-lb-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -51,7 +50,6 @@ on:
- "pkg/gateway/lb/**"
- "cmd/gateway/lb/**"
- "pkg/gateway/internal/**"
- "dockers/base/Dockerfile"
- "dockers/gateway/lb/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-gateway-meta-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -51,7 +50,6 @@ on:
- "pkg/gateway/meta/**"
- "cmd/gateway/meta/**"
- "pkg/gateway/internal/**"
- "dockers/base/Dockerfile"
- "dockers/gateway/meta/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-gateway-vald-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -47,7 +46,6 @@ on:
- "apis/grpc/**"
- "pkg/gateway/vald/**"
- "cmd/gateway/vald/**"
- "dockers/base/Dockerfile"
- "dockers/gateway/vald/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-loadtest-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-manager-compressor-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -47,7 +46,6 @@ on:
- "apis/grpc/**"
- "pkg/manager/compressor/**"
- "cmd/manager/compressor/**"
- "dockers/base/Dockerfile"
- "dockers/manager/compressor/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-manager-index-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -47,7 +46,6 @@ on:
- "apis/grpc/**"
- "pkg/manager/index/**"
- "cmd/manager/index/**"
- "dockers/base/Dockerfile"
- "dockers/manager/index/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-meta-cassandra-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -49,7 +48,6 @@ on:
- "apis/grpc/**"
- "pkg/meta/cassandra/**"
- "cmd/meta/cassandra/**"
- "dockers/base/Dockerfile"
- "dockers/meta/cassandra/Dockerfile"
- "versions/GO_VERSION"

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/dockers-meta-redis-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -49,7 +48,6 @@ on:
- "apis/grpc/**"
- "pkg/meta/redis/**"
- "cmd/meta/redis/**"
- "dockers/base/Dockerfile"
- "dockers/meta/redis/Dockerfile"
- "versions/GO_VERSION"

Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 0 additions & 15 deletions Makefile.d/docker.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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)"
Expand Down
Loading