Merge branch 'main' into rl/upstream-use-common-environment-variable-…

…names
IQTLabs · Oct 17, 2023 · d47bebc · d47bebc
2 parents be4ca31 + 997d2b4
commit d47bebc
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 64 deletions.
diff --git a/.github/workflows/code-quality.yaml b/.github/workflows/code-quality.yaml
@@ -1,13 +1,15 @@
 name: Code Quality Checks
 
-on: pull_request
+on: [pull_request_target]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     name: Code Quality Checks
     steps:
     - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.event.pull_request.head.sha }}
     - uses: actions/setup-python@v4
       with:
         python-version: 3.9.13

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -1,52 +1,36 @@
 name: Container Processing
 
-on: 
+on:
   push:
-  pull_request:
+    branches: [ "main" ]
 
 jobs:
-  build:
+  push_to_registry:
+    name: Push Docker image to DockerHub
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Get tag
-      id: get_tag
-      run: |
-        echo "::set-output name=IMAGE_TAG::$(echo $GITHUB_REF | cut -d / -f 3)"
-    
-    - name: Set up qemu
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: all
+      - name: Set up Docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
 
-    - name: Set up Docker buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v3
-      with:
-        version: latest
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3 
+        with:
+          username: ${{ vars.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
 
-    - name: Login to Docker Hub
-      run: echo "${{ secrets.DOCKER_TOKEN }}" | docker login --username "${{ vars.DOCKER_USERNAME }}" --password-stdin
+      - name: Set DOCKER_FOLDER
+        run: echo "DOCKER_FOLDER=$(echo ${{ github.event.repository.name }} | sed 's/edgetech-//')" >> $GITHUB_ENV
 
-    - name: Get changes
-      id: identify
-      uses: jitterbit/get-changed-files@v1
-    - run: |
-        echo ${{ steps.files.output.all }}
-
-    - name: Build image
-      env: 
-        GITHUB_REPOSITORY: ${{ github.repository }}
-        REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
-        DOCKER_FOLDER: "daisy"
-        DOCKER_NAMESPACE: ${{ vars.DOCKER_NAMESPACE }}
-        TAG_NAME: ${{ steps.get_tag.outputs.IMAGE_TAG }}
-      run: |
-        GITHUB_REPO=$(basename $GITHUB_REPOSITORY)
-        docker buildx build $DOCKER_FOLDER \
-        --platform linux/arm64,linux/amd64 \
-        --push \
-        --tag $DOCKER_NAMESPACE/$GITHUB_REPO:latest \
-        --tag $DOCKER_NAMESPACE/$GITHUB_REPO:$TAG_NAME
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ env.DOCKER_FOLDER }}
+          platforms: linux/arm64,linux/amd64
+          push: true
+          tags: ${{ vars.DOCKER_NAMESPACE }}/${{ github.event.repository.name }}:latest
diff --git a/.github/workflows/docker-cleanup.yaml b/.github/workflows/docker-cleanup.yaml
@@ -0,0 +1,17 @@
+name: Untag PR Docker Image
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  untag-image:
+    name: Untag PR Docker Image from Dockerhub
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Untag Docker image on DockerHub
+      run: |
+        TOKEN=$(curl -s -H "Content-Type: application/json" -X POST -d '{"username": "${{ vars.DOCKER_USERNAME }}", "password": "${{ secrets.DOCKER_TOKEN }}"}' "https://hub.docker.com/v2/users/login/" | jq -r .token)
+        curl "https://hub.docker.com/v2/repositories/${{ vars.DOCKER_NAMESPACE }}/${{ github.event.repository.name }}/tags/testing-PR${{ github.event.pull_request.number }}" -X DELETE -H "Authorization: JWT $TOKEN"
diff --git a/.github/workflows/docker-test.yaml b/.github/workflows/docker-test.yaml
@@ -0,0 +1,32 @@
+name: Docker Build Testing
+
+on: [pull_request_target]
+
+
+
+jobs:
+  push_to_registry:
+    name: Test Docker Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Set up Docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
+
+      - name: Set DOCKER_FOLDER
+        run: echo "DOCKER_FOLDER=$(echo ${{ github.event.repository.name }} | sed 's/edgetech-//')" >> $GITHUB_ENV
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ env.DOCKER_FOLDER }}
+          platforms: linux/arm64,linux/amd64
+          push: false
+          tags: ${{ vars.DOCKER_NAMESPACE }}/${{ github.event.repository.name }}:testing-PR${{ github.event.pull_request.number }}
diff --git a/.github/workflows/release-tag.yaml b/.github/workflows/release-tag.yaml
@@ -5,29 +5,34 @@ on:
     types: [ "published" ]
 
 jobs:
-  tag-remote:
+  push_to_registry:
+    name: Dockerhub Release
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Docker buildx
-      id: buildx
-      uses: docker/setup-buildx-action@v3
-      with:
-        version: latest
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Login to Docker Hub
-      run: echo "${{ secrets.DOCKER_TOKEN }}" | docker login --username "${{ vars.DOCKER_USERNAME }}" --password-stdin
+      - name: Set up Docker buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          version: latest
 
-    - name: Build image
-      env: 
-        GITHUB_REPOSITORY: ${{ github.repository }}
-        REPO_TOKEN: ${{ secrets.REPO_TOKEN }}
-        DOCKER_FOLDER: "daisy"
-        DOCKER_NAMESPACE: ${{ vars.DOCKER_NAMESPACE }}
-        RELEASE_NAME: ${{ github.event.release.name }}
-      run: |
-        GITHUB_REPO=$(basename $GITHUB_REPOSITORY)
-        docker buildx build $DOCKER_FOLDER \
-        --platform linux/arm64,linux/amd64 \
-        --push \
-        --tag $DOCKER_NAMESPACE/$GITHUB_REPO:latest \
-        --tag $DOCKER_NAMESPACE/$GITHUB_REPO:$RELEASE_NAME
+      - name: Log in to DockerHub
+        uses: docker/login-action@v3 
+        with:
+          username: ${{ vars.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_TOKEN }}
+
+      - name: Set DOCKER_FOLDER
+        run: echo "DOCKER_FOLDER=$(echo ${{ github.event.repository.name }} | sed 's/edgetech-//')" >> $GITHUB_ENV
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: ${{ env.DOCKER_FOLDER }}
+          platforms: linux/arm64,linux/amd64
+          push: true
+          tags: |
+            ${{ vars.DOCKER_NAMESPACE }}/${{ github.event.repository.name }}:${{ github.event.release.name }}
+            ${{ vars.DOCKER_NAMESPACE }}/${{ github.event.repository.name }}:stable