docker

Author: james-otten

.github/workflows/deploy.yaml

@@ -12,19 +12,47 @@ on:
 permissions: read-all
 
 jobs:
+  push_to_registry:
+    name: Push Docker Image to Docker Hub
+    runs-on: ubuntu-latest
+    environment: dev3
+    outputs:
+      image_digest: ${{ steps.build.outputs.digest }}
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push Docker image
+        id: build
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: jamesomesh/airflow:latest
+
   deploy_to_dev3:
     name: Deploy to dev 3
     uses: ./.github/workflows/helm-deploy.yaml
+    needs: push_to_registry
     with:
       environment: dev3
+      image_digest: ${{ needs.push_to_registry.outputs.image_digest }}
     secrets: inherit
     # if: github.ref == 'refs/heads/main'
 
   # deploy_to_prod1:
   #   name: Deploy to prod 1
-  #   needs: deploy_to_dev3
+  #   needs: [ push_to_registry, deploy_to_dev3 ]
   #   uses: ./.github/workflows/helm-deploy.yaml
   #   with:
   #     environment: prod1
+  #     image_digest: ${{ needs.push_to_registry.outputs.image_digest }}
   #   secrets: inherit
   #   if: github.ref == 'refs/heads/main'

.github/workflows/helm-deploy.yaml

@@ -7,6 +7,9 @@ on:
       environment:
         required: true
         type: string
+      image_digest:
+        required: true
+        type: string
 
 jobs:
   helm_deploy:
@@ -72,6 +75,8 @@ jobs:
             --set webserver.startupProbe.failureThreshold="60" \
             --set webserverSecretKey="${{ secrets.AIRFLOW_SECRET_KEY }}" \
             --set fernetKey="${{ secrets.AIRFLOW_FERNET_KEY }}" \
+            --set images.airflow.repository="jamesomesh/airflow" \
+            --set images.airflow.digest="${{ inputs.image_digest }}" \
             -f infra/extra.yaml
 
           # Rolling restart

Dockerfile

@@ -0,0 +1,4 @@
+FROM apache/airflow:2.8.4-python3.9
+
+RUN pip install --no-cache-dir \
+    requirements.txt

dags/nycmesh_generate_omni_cert.py

@@ -92,7 +92,7 @@ def deploy_to_omni(ip, password, cert_path, priv_key_path):
                 print(stderr.read())
 
         import subprocess
-        subprocess.check_call([sys.executable, "-m", "pip", "install", "certbot", "certbot-dns-rfc2136", "paramiko==3.5.1", "scp==0.15.0", "cryptography==42.0.8"])
+        #subprocess.check_call([sys.executable, "-m", "pip", "install", "certbot", "certbot-dns-rfc2136", "paramiko==3.5.1", "scp==0.15.0", "cryptography==42.0.8"])
 
         # Imports inside of the virtual environment
         from paramiko import SSHClient, AutoAddPolicy

requirements.txt

@@ -0,0 +1,5 @@
+certbot
+certbot-dns-rfc2136
+paramiko==3.5.1
+scp==0.15.0
+cryptography==42.0.8