This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch release/apisix-2.10.3
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/release/apisix-2.10.3 by this
push:
new 154a895 feat: bump APISIX to 2.10.3 (#270)
154a895 is described below
commit 154a8959cd9802236a08b92ff185b2e4c55b3346
Author: Zeping Bai <[email protected]>
AuthorDate: Fri Jan 21 15:45:53 2022 +0800
feat: bump APISIX to 2.10.3 (#270)
---
.github/workflows/apisix-docker-test.yaml | 2 +-
Makefile | 28 +++++++++++++++++++++-------
alpine/hooks/build | 22 ----------------------
centos/hooks/build | 22 ----------------------
4 files changed, 22 insertions(+), 52 deletions(-)
diff --git a/.github/workflows/apisix-docker-test.yaml
b/.github/workflows/apisix-docker-test.yaml
index 7629f78..093e3eb 100644
--- a/.github/workflows/apisix-docker-test.yaml
+++ b/.github/workflows/apisix-docker-test.yaml
@@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
env:
APISIX_PATH: "./apisix-local"
- APISIX_DOCKER_TAG: 2.11.0-${{ matrix.platform }}
+ APISIX_DOCKER_TAG: 2.10.3-${{ matrix.platform }}
steps:
- uses: actions/checkout@v2
diff --git a/Makefile b/Makefile
index 4a8c848..932b071 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
# APISIX ARGS
-APISIX_VERSION ?= 2.11.0
+APISIX_VERSION ?= 2.10.3
IMAGE_NAME = apache/apisix
IMAGE_TAR_NAME = apache_apisix
@@ -64,7 +64,9 @@ endef
.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 .
+ $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-centos \
+ --build-arg APISIX_VERSION=$(APISIX_VERSION) \
+ -f ./centos/Dockerfile .
@$(call func_echo_success_status, "$@ -> [ Done ]")
@@ -72,7 +74,9 @@ build-on-centos:
.PHONY: build-on-alpine
build-on-alpine:
@$(call func_echo_status, "$@ -> [ Start ]")
- $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine -f
./alpine/Dockerfile .
+ $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine \
+ --build-arg APISIX_VERSION=$(APISIX_VERSION) \
+ -f ./alpine/Dockerfile .
@$(call func_echo_success_status, "$@ -> [ Done ]")
@@ -82,7 +86,9 @@ build-on-alpine:
.PHONY: build-on-alpine-local
build-on-alpine-local:
@$(call func_echo_status, "$@ -> [ Start ]")
- $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine-local
--build-arg APISIX_PATH=${APISIX_PATH} -f ./alpine-local/Dockerfile .
+ $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine-local \
+ --build-arg APISIX_PATH=${APISIX_PATH} \
+ -f ./alpine-local/Dockerfile .
@$(call func_echo_success_status, "$@ -> [ Done ]")
@@ -92,7 +98,9 @@ build-on-alpine-local:
push-on-centos:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) push $(ENV_APISIX_IMAGE_TAG_NAME)-centos
- $(ENV_DOCKER) build -t $(IMAGE_NAME):latest -f ./centos/Dockerfile .
+ $(ENV_DOCKER) build -t $(IMAGE_NAME):latest \
+ --build-arg APISIX_VERSION=$(APISIX_VERSION) \
+ -f ./centos/Dockerfile .
$(ENV_DOCKER) push $(IMAGE_NAME):latest
@$(call func_echo_success_status, "$@ -> [ Done ]")
@@ -103,6 +111,7 @@ push-multiarch-on-alpine:
@$(call func_echo_status, "$@ -> [ Start ]")
$(ENV_DOCKER) buildx build --push \
-t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine \
+ --build-arg APISIX_VERSION=$(APISIX_VERSION) \
--platform linux/amd64,linux/arm64 \
-f ./alpine/Dockerfile .
@$(call func_echo_success_status, "$@ -> [ Done ]")
@@ -112,7 +121,10 @@ push-multiarch-on-alpine:
.PHONY: build-on-alpine-cn
build-on-alpine-cn:
@$(call func_echo_status, "$@ -> [ Start ]")
- $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine --build-arg
APISIX_VERSION=$(APISIX_VERSION) --build-arg ENABLE_PROXY=true -f
alpine/Dockerfile alpine
+ $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-alpine \
+ --build-arg APISIX_VERSION=$(APISIX_VERSION) \
+ --build-arg ENABLE_PROXY=true \
+ -f alpine/Dockerfile alpine
@$(call func_echo_success_status, "$@ -> [ Done ]")
@@ -120,7 +132,9 @@ build-on-alpine-cn:
.PHONY: build-all-in-one
build-all-in-one:
@$(call func_echo_status, "$@ -> [ Start ]")
- $(ENV_DOCKER) build -t $(IMAGE_NAME):whole -f
./all-in-one/apisix/Dockerfile .
+ $(ENV_DOCKER) build -t $(IMAGE_NAME):whole \
+ --build-arg APISIX_VERSION=$(APISIX_VERSION) \
+ -f ./all-in-one/apisix/Dockerfile .
@$(call func_echo_success_status, "$@ -> [ Done ]")
diff --git a/alpine/hooks/build b/alpine/hooks/build
deleted file mode 100644
index e229008..0000000
--- a/alpine/hooks/build
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# hooks/build
-# https://docs.docker.com/docker-cloud/builds/advanced/
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-docker build --build-arg APISIX_VERSION=$APISIX_VERSION -t $IMAGE_NAME .
diff --git a/centos/hooks/build b/centos/hooks/build
deleted file mode 100644
index e229008..0000000
--- a/centos/hooks/build
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# hooks/build
-# https://docs.docker.com/docker-cloud/builds/advanced/
-
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-docker build --build-arg APISIX_VERSION=$APISIX_VERSION -t $IMAGE_NAME .
