Resolved merge conflict by incorporating both suggestions.

This commit is contained in:
Christian Korneck 2020-08-28 10:15:11 +02:00
parent 2584345fcb
commit 0d08ba730b

View File

@ -443,14 +443,9 @@ Set up your GitHub Actions workflow with a specific version of your programming
- [Monitor and limit your docker image size](https://github.com/wemake-services/docker-image-size-limit) - [Monitor and limit your docker image size](https://github.com/wemake-services/docker-image-size-limit)
- [Publish Docker Images to the Amazon Elastic Container Registry (ECR)](https://github.com/appleboy/docker-ecr-action) - [Publish Docker Images to the Amazon Elastic Container Registry (ECR)](https://github.com/appleboy/docker-ecr-action)
- [Build And Push Your Docker Images Caching Each Stage To Reduce Build Time](https://github.com/whoan/docker-build-with-cache-action) - [Build And Push Your Docker Images Caching Each Stage To Reduce Build Time](https://github.com/whoan/docker-build-with-cache-action)
<<<<<<< HEAD
- [Update a Container Repository Description From README.md](https://github.com/marketplace/actions/update-container-description-action) (Supported Registries: Docker Hub, Quay, Harbor)
||||||| merged common ancestors
=======
- [Set up Docker Buildx](https://github.com/crazy-max/ghaction-docker-buildx) - [Set up Docker Buildx](https://github.com/crazy-max/ghaction-docker-buildx)
- [Convert Branch or Tag Name Into Docker-Compatible Image Tag](https://github.com/ankitvgupta/ref-to-tag-action/) - [Convert Branch or Tag Name Into Docker-Compatible Image Tag](https://github.com/ankitvgupta/ref-to-tag-action/)
>>>>>>> upstream/master - [Update a Container Repository Description From README.md](https://github.com/marketplace/actions/update-container-description-action) (Supported Registries: Docker Hub, Quay, Harbor)
#### Kubernetes #### Kubernetes