Skip to content

Commit

Permalink
chore: remove centos based docker images (#512)
Browse files Browse the repository at this point in the history
  • Loading branch information
shreemaan-abhishek authored Oct 13, 2023
1 parent 96e5b04 commit abab1e8
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 255 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
fail-fast: false
matrix:
platform:
- centos
- debian
- redhat

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/apisix-docker-example-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
fail-fast: false
matrix:
platform:
- centos
- debian
- redhat

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/apisix_push_docker_hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jobs:
fail-fast: false
matrix:
platform:
- centos
- debian
- redhat
env:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/dashboard_push_docker_hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ jobs:
fail-fast: false
matrix:
os:
- centos
- alpine

name: build dashboard & test on ${{ matrix.os }} && push to docker hub
Expand Down Expand Up @@ -55,7 +54,3 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Push apisix dashboard image to Docker Hub
if: matrix.os == 'centos'
run: |
make push-multiarch-dashboard
68 changes: 0 additions & 68 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,6 @@ define func_echo_success_status
endef


# Makefile target
### build-on-centos : Build apache/apisix:xx-centos image
.PHONY: build-on-centos
build-on-centos:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-centos -f ./centos/Dockerfile centos
@$(call func_echo_success_status, "$@ -> [ Done ]")

### build-on-redhat : Build apache/apisix:xx-redhat image
.PHONY: build-on-redhat
build-on-redhat:
Expand Down Expand Up @@ -114,16 +106,6 @@ push-multiarch-on-debian:
@$(call func_echo_success_status, "$@ -> [ Done ]")


### push-multiarch-on-centos : Push apache/apisix:xx-centos image
.PHONY: push-multiarch-on-centos
push-multiarch-on-centos:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) buildx build --network=host --push \
-t $(ENV_APISIX_IMAGE_TAG_NAME)-centos \
--platform linux/amd64,linux/arm64 \
-f ./centos/Dockerfile centos
@$(call func_echo_success_status, "$@ -> [ Done ]")

### push-multiarch-on-redhat : Push apache/apisix:xx-redhat image
.PHONY: push-multiarch-on-redhat
push-multiarch-on-redhat:
Expand Down Expand Up @@ -166,15 +148,6 @@ build-dashboard-all-in-one:
@$(call func_echo_success_status, "$@ -> [ Done ]")


### save-centos-tar : tar apache/apisix:xx-centos image
.PHONY: save-centos-tar
save-centos-tar:
@$(call func_echo_status, "$@ -> [ Start ]")
mkdir -p package
$(ENV_DOCKER) save -o ./package/$(ENV_APISIX_TAR_NAME)-centos.tar $(ENV_APISIX_IMAGE_TAG_NAME)-centos
@$(call func_echo_success_status, "$@ -> [ Done ]")


### save-debian-tar : tar apache/apisix:xx-debian image
.PHONY: save-debian-tar
save-debian-tar:
Expand All @@ -184,16 +157,6 @@ save-debian-tar:
@$(call func_echo_success_status, "$@ -> [ Done ]")


### build-dashboard-centos : Build apache/dashboard:tag image on centos
.PHONY: build-dashboard-centos
build-dashboard-centos:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) build -t $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION) \
--build-arg APISIX_DASHBOARD_TAG=v$(APISIX_DASHBOARD_VERSION) \
-f ./dashboard/Dockerfile.centos .
@$(call func_echo_success_status, "$@ -> [ Done ]")


### build-dashboard-alpine : Build apache/dashboard:tag image on alpine
.PHONY: build-dashboard-alpine
build-dashboard-alpine:
Expand All @@ -204,37 +167,6 @@ build-dashboard-alpine:
@$(call func_echo_success_status, "$@ -> [ Done ]")


### push-multiarch-dashboard : Build and push multiarch apache/dashboard:tag image
.PHONY: push-multiarch-dashboard
push-multiarch-dashboard:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) buildx build --push \
-t $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION)-alpine \
--build-arg APISIX_DASHBOARD_TAG=v$(APISIX_DASHBOARD_VERSION) \
--platform linux/amd64,linux/arm64 \
-f ./dashboard/Dockerfile.alpine .
$(ENV_DOCKER) buildx build --push \
-t $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION)-centos \
--build-arg APISIX_DASHBOARD_TAG=v$(APISIX_DASHBOARD_VERSION) \
--platform linux/amd64,linux/arm64 \
-f ./dashboard/Dockerfile.centos .
$(ENV_DOCKER) buildx build --push \
-t $(APISIX_DASHBOARD_IMAGE_NAME):latest \
--build-arg APISIX_DASHBOARD_TAG=v$(APISIX_DASHBOARD_VERSION) \
--platform linux/amd64,linux/arm64 \
-f ./dashboard/Dockerfile.centos .
@$(call func_echo_success_status, "$@ -> [ Done ]")


### save-dashboard-centos-tar : tar apache/apisix-dashboard:tag image
.PHONY: save-dashboard-centos-tar
save-dashboard-centos-tar:
@$(call func_echo_status, "$@ -> [ Start ]")
mkdir -p package
$(ENV_DOCKER) save -o ./package/$(APISIX_DASHBOARD_IMAGE_TAR_NAME)_$(APISIX_DASHBOARD_VERSION)-centos.tar $(APISIX_DASHBOARD_IMAGE_NAME):$(APISIX_DASHBOARD_VERSION)
@$(call func_echo_success_status, "$@ -> [ Done ]")


### save-dashboard-alpine-tar : tar apache/apisix-dashboard:tag image
.PHONY: save-dashboard-alpine-tar
save-dashboard-alpine-tar:
Expand Down
45 changes: 0 additions & 45 deletions centos/Dockerfile

This file was deleted.

61 changes: 0 additions & 61 deletions centos/docker-entrypoint.sh

This file was deleted.

71 changes: 0 additions & 71 deletions dashboard/Dockerfile.centos

This file was deleted.

4 changes: 2 additions & 2 deletions docs/en/latest/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Build a Docker image from the release:

```shell
APISIX_VERSION=3.6.0 # specify release version
DISTRO=debian # debian, centos, redhat
DISTRO=debian # debian, redhat
make build-on-$DISTRO
```

Expand All @@ -56,7 +56,7 @@ Build a Docker image from the master branch:

```shell
APISIX_VERSION=master # master branch
DISTRO=debian # debian, centos, redhat
DISTRO=debian # debian, redhat
make build-on-$DISTRO
```

Expand Down

0 comments on commit abab1e8

Please sign in to comment.