feat: use docker to deploy fpm #55
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix: add proxy for testing fix: `ARG` before `FROM` test: add test for all branches test: add comments fix: remove docker system prune for testing fix: apisix output path fix: Update package-apisix-openresty.yml fix: apisix-dashboard output path fix: apisix-openresty path fix: bugs fix: bugs fix: bugs fix: openresty path fix: Update package-apisix-openresty.yml fix: Update Dockerfile.apisix.rpm fix: Update Makefile fix: dashboard bash script fix: dashboard bash script name fix: Makefile dashboard copy path fix: Dashboard and openresty output path fix: add docker system prune fix: remove comments and proxy fix: remove test for all branches
EnableAsync
force-pushed
the
feat/docker_fpm
branch
from
fdfabf6
to
d73bfed
Compare
EnableAsync
changed the title
spacewander
reviewed
Jul 8, 2021
dockerfiles/Dockerfile.apisix.rpm
Outdated
| @@ -1,6 +1,6 @@ | |||
| ARG image_base="centos" | |||
| ARG image_tag="7" | |||
| ARG checkout_v="2.2" | |||
| ARG checkout_v="2.6" | |||
There was a problem hiding this comment.
We always require to pass a checkout_v. Could we assign it to an empty string?
Makefile
Outdated
| --config-files usr/lib/systemd/system/apisix.service | ||
| rm -rf ${PWD}/build | ||
| docker build -t apache/apisix-packaged:$(version) \ | ||
| --build-arg VERSION=$(version) \ |
There was a problem hiding this comment.
please fix the indentation.
Makefile
Outdated
| --build-arg ITERATION=$(iteration) \ | ||
| --build-arg PACKAGE_VERSION=$(version) \ | ||
| -f ./dockerfiles/Dockerfile.package.apisix . | ||
| docker run -d --name output --net="host" apache/apisix-packaged:$(version) |
| ### build fpm for packaging: | ||
| .PHONY: build-fpm | ||
| build-fpm: | ||
| docker build -t api7/fpm - < ./dockerfiles/Dockerfile.fpm |
There was a problem hiding this comment.
if use -f, we need to pass the context which include files that are not necessary for building an image. This will results in a larger build context and larger image size.
| @@ -22,7 +22,7 @@ jobs: | |||
|
|
|||
| - name: build apisix-openresty rpm | |||
| run: | | |||
| make package type=rpm app=apisix-openresty version=${BUILD_APISIX_OR_VERSION} | |||
| make package type=rpm app=apisix-openresty version=${BUILD_APISIX_OR_VERSION} checkout=${BUILD_APISIX_OR_VERSION} | |||
There was a problem hiding this comment.
apisix-openresty uses 'checkout'?
There was a problem hiding this comment.
Thank you for the reminder. I will remove it.
Fix: checkout for apisix
spacewander
approved these changes
Jul 9, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix: #20
What this PR does: