Merge pull request corndeladmin#1 from corndeladmin/deploy-with-docker

Deploy with docker

Author: JackMeadDev

.dockerignore

@@ -2,4 +2,8 @@
 __pycache__/
 .env
 .azure
-.venv
+.venv
+
+Dockerfile
+.github
+.gitlab-ci.yml

.github/workflows/deploy.yml

@@ -0,0 +1,29 @@
+name: Deploy
+on: 
+  push
+
+jobs:
+  my-job:
+    runs-on: ubuntu-latest
+    env:
+        # REPLACE THIS
+        DOCKERHUB_USERNAME: corndeldevopscourse
+        # SET THESE IN GITHUB
+        DOCKERHUB_TOKEN: '${{ secrets.DOCKERHUB_TOKEN }}'
+        AZURE_WEBHOOK: '${{ secrets.AZURE_WEBHOOK }}'
+    # DECIDE WHETHER YOU WANT A BRANCH CHECK - if so remove the other "if"
+    # if: github.ref == 'refs/heads/master'
+    if: github.repository != 'CorndelWithSoftwire/DevOps-Course-Workshop-Module-13-Learners'
+    steps:
+      - name: test
+        run: echo ${{ github.repository }}
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Build image
+        run: docker build --tag ${DOCKERHUB_USERNAME}/m13-order-processing-app --target production .
+      - name: Docker login
+        run: echo $DOCKERHUB_TOKEN | docker login -u $DOCKERHUB_USERNAME --password-stdin
+      - name: Push image
+        run: docker push ${DOCKERHUB_USERNAME}/m13-order-processing-app
+      - name: Trigger deployment
+        run: curl --fail-with-body -X POST "$AZURE_WEBHOOK"

.gitlab-ci.yml

@@ -0,0 +1,24 @@
+image: docker:latest
+stages:
+  - deploy
+services:
+  - docker:dind
+
+variables:
+  # REPLACE THIS, and set DOCKERHUB_TOKEN & AZURE_WEBHOOK in pipeline variables
+  # Make sure that "Expand Variable" is **off** for the webhook, and that both secrets are masked
+  DOCKERHUB_USERNAME: corndeldevopscourse
+
+deploy:
+  stage: deploy
+  # UNCOMMENT IF YOU WANT A BRANCH CHECK
+  # only:
+  #   refs:
+  #     - master
+
+  script:
+    - docker build --tag ${DOCKERHUB_USERNAME}/m13-order-processing-app --target production .
+    - echo $DOCKERHUB_TOKEN | docker login -u $DOCKERHUB_USERNAME --password-stdin
+    - docker push ${DOCKERHUB_USERNAME}/m13-order-processing-app
+    - apk add --update-cache curl
+    - curl -dHf -X POST "$AZURE_WEBHOOK"

Dockerfile

@@ -19,9 +19,6 @@ COPY . /app
 
 WORKDIR /app
 
-# Use a launch script to support both env variable expansion
-# And command line arguments
-ENTRYPOINT flask run --host 0.0.0.0 --port "${PORT}" "$@"
 
 ####################################
 # Production Image
@@ -30,9 +27,15 @@ FROM base as production
 ENV FLASK_ENV=production
 EXPOSE 80
 
+ENTRYPOINT gunicorn "app:app" -b 0.0.0.0:$PORT "$@"
+
 ####################################
 # Local Development Image
 FROM base as development
 
 ENV FLASK_ENV=development
-EXPOSE 80
+EXPOSE 80
+
+# Use a launch script to support both env variable expansion
+# And command line arguments
+ENTRYPOINT flask run --host 0.0.0.0 --port "${PORT}" "$@"

README.md

@@ -50,13 +50,36 @@ logging.basicConfig(level=logging.INFO)
 
 ## Deploy your changes
 
-For the purpose of this workshop it is fine to directly push changes to the app.
-In a real setting you are likely to need to push changes to Git and get your CI/CD server to do a release.
+For the purpose of this workshop there is a default CD pipeline configured in `.github/workflows/deploy.yml` or `.gitlab-ci.yml` depending on your platform. In order to make use of this you will need to:
+* Update that pipeline file to contain your DockerHub username
+* In Azure, under your App Service's "Deployment Center", update the image name/tag to `<your_dockerhub_username>/m13-order-processing-app`
+* Grab the "Webhook URL" from the Deployment Center and add it to your CI pipeline secrets/variables as `AZURE_WEBHOOK`
+  * If using GitLab, make sure that the "Expand variable" option is off, and the secret is masked and available to your branch
+* [Generate a DockerHub token](https://docs.docker.com/docker-hub/access-tokens/#create-an-access-token) and set it in the repository pipeline secrets/variables under `DOCKERHUB_TOKEN`
+
+When you're ready, push those changes to your fork which will update your DockerHub image and notify your server to pull the latest and restart.
+
+If you find this step slow, or just prefer to release manually, then you will still need to update the App Service but can always build & push the latest image directly 
+```bash
+docker build --tag ${DOCKERHUB_USERNAME}/m13-order-processing-app --target production .
+docker push ${DOCKERHUB_USERNAME}/m13-order-processing-app
+```
+
+You'll also need to trigger the webhook - you can do this directly, or you can register that with DockerHub to do that for you.
+
+<details><summary>Register a webhook in DockerHub</summary>
 
-In the root of the project run `az login` then `az webapp up -n {App Service name} && az webapp restart` (or `(az webapp up -n {App Service name}) -and (az webapp restart)` if using a version of PowerShell before PowerShell7). {App Service name} is name of the App Service resource in the Azure Portal, which is also the first part of the web address (e.g. `XXX-order-processing-app`)
-This will push your current code to the server and restart it.
+DockerHub allows you to register webhooks on individual image repositories, you can find that through:
+1) Signing in
+1) Navigating to "My Profile" from the dropdown by your username
+1) Selecting the relevant image repository
+1) Selecting "Manage Repository"
+1) Select the "Webhooks" tab and entering appropriate details
 
-Subsequent deploys can be done with just `az webapp up && az webapp restart` (or `(az webapp up) -and (az webapp restart)` for PowerShell), as your login and the App Service name name will be remembered.
+Or alternatively by jumping to this URL with the appropriate values completed:
+
+https://hub.docker.com/repository/docker/\<YOUR_USERNAME\>/\<IMAGE_NAME\>/webhooks
+</details>
 
 ## Investigate and fix
 

requirements.txt

@@ -5,3 +5,4 @@ flask-sqlalchemy>=2.5.1
 pyodbc>=4.0.32
 pytz>=2022.1
 apscheduler==3.9.1
+gunicorn>=21.2.0