diff --git a/README.md b/README.md index 1e8b434..7245d29 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,9 @@ # AZURE-CICD-Deployment-with-Github-Actions ## Save pass: - -<<<<<<< HEAD -s3cEZKH5yytiVnJ3h+eI3qhhzf9q1vNwEi6+q+WGdd+ACRCZ7JD6 - -======= ->>>>>>> 3a8f687cc5a6b6690ed2ad7da6a658e09291b7b9 - ## Run from terminal: docker build -t chickenapp.azurecr.io/chicken:latest . - -<<<<<<< HEAD docker login # AZURE-CICD-Deployment-with-Github-Actions ## Run from terminal: @@ -38,7 +29,7 @@ docker build -t chickenapp.azurecr.io/chicken:latest . docker login chickenapp.azurecr.io ======= docker login chickenapp.azurecr.io/chicken ->>>>>>> 3a8f687cc5a6b6690ed2ad7da6a658e09291b7b9 + docker push chickenapp.azurecr.io/chicken:latest @@ -58,8 +49,5 @@ docker push chickenapp.azurecr.io/chicken:latest 1. Build the Docker image of the Source Code 2. Push the Docker image to Container Registry 3. Launch the Web App Server in Azure -<<<<<<< HEAD -4. Pull the Docker image from the container registry to Web App server and run -======= 4. Pull the Docker image from the container registry to Web App server and run ->>>>>>> 3a8f687cc5a6b6690ed2ad7da6a658e09291b7b9 +