Merge remote-tracking branch 'origin/master' into favyen/marine-infra

allenai · Dec 12, 2024 · 07565da · 07565da
2 parents f6bbc78 + 6723324
commit 07565da
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/.github/workflows/landsat_vessel.yaml b/.github/workflows/landsat_vessel.yaml
@@ -6,44 +6,52 @@ on:
     tags:
       - "landsat_vessels_v*" # Trigger only when a version tag (e.g., landsat_vessels_v0.0.1) is pushed
 
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: "landsat-vessel-detection"
+  SERVICE_NAME: "landsat_vessels"
+  ORG_NAME: "allenai"
+
 jobs:
   build-and-push:
-    runs-on: GPU-Enabled-Runner
-
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
       # Step 1: Checkout the repository and fetch all tags
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Ensure all history and tags are fetched
 
       - name: Fetch tags
-        run: git fetch --tags
+        run: git fetch --tags --force
 
       # Step 2: Extract the version from the latest tag and its associated commit SHA
       - name: Get latest tag and associated SHA
         id: version
         run: |
-          # Get the latest tag matching the pattern
-          LATEST_TAG=$(git tag --list "landsat_vessels_v*" --sort=-v:refname | head -n 1)
+          LATEST_TAG=$(git tag --list "${{ env.SERVICE_NAME }}_v*" --sort=-v:refname | head -n 1)
           TAG_COMMIT=$(git rev-list -n 1 $LATEST_TAG)
           SHORT_SHA=$(git rev-parse --short $TAG_COMMIT)
           echo "LATEST_TAG=$LATEST_TAG" >> $GITHUB_ENV
           echo "SHORT_SHA=$SHORT_SHA" >> $GITHUB_ENV
 
       # Step 3: Log in to GHCR
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
-          username: ${{ secrets.GITHUB_ACTOR }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Step 4: Build and push the Docker image
+      # Step 4: Build and Push Docker Image
       - name: Build and Push Docker Image
-        working-directory: rslp/landsat_vessels # Navigate to the required directory
+        working-directory: rslp/${{ env.SERVICE_NAME }}
         run: |
           docker compose build
-          docker tag landsat_vessels-landsat-vessels ghcr.io/allenai/landsat-vessel-detection:sha-${{ env.SHORT_SHA }}
-          docker tag landsat_vessels-landsat-vessels ghcr.io/allenai/landsat-vessel-detection:${{ env.LATEST_TAG }}
-          docker push ghcr.io/allenai/landsat-vessel-detection:sha-${{ env.SHORT_SHA }}
-          docker push ghcr.io/allenai/landsat-vessel-detection:${{ env.LATEST_TAG }}
+          docker tag ${{ env.SERVICE_NAME }}:latest ${{ env.REGISTRY }}/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }}:sha-${{ env.SHORT_SHA }}
+          docker tag ${{ env.SERVICE_NAME }}:latest ${{ env.REGISTRY }}/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }}:${{ env.LATEST_TAG }}
+          docker push ${{ env.REGISTRY }}/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }}:sha-${{ env.SHORT_SHA }}
+          docker push ${{ env.REGISTRY }}/${{ env.ORG_NAME }}/${{ env.IMAGE_NAME }}:${{ env.LATEST_TAG }}
diff --git a/rslp/landsat_vessels/docker-compose.yaml b/rslp/landsat_vessels/docker-compose.yaml
@@ -13,6 +13,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+    image: landsat_vessels:latest
     depends_on:
       - base-image
     ports: