update

tgxn · Oct 11, 2023 · 16fd5d7 · 16fd5d7
1 parent a08195b
commit 16fd5d7
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 30 deletions.
diff --git a/.github/workflows/ghcr-image-develop.yaml b/.github/workflows/ghcr-image-develop.yaml
@@ -22,23 +22,23 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # - name: Extract metadata (tags, labels) for Docker
-      #   id: meta
-      #   uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-      #   with:
-      #     images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/${{ env.IMAGE_NAME }}
+          tags: ${{ env.IMAGE_TAG }}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      - name: Build and push Docker image to GHCR
+        uses: docker/build-push-action@v5
         with:
-          # context: .
+          context: .
           push: true
-          tags: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
-          # labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/ghcr-image-main.yaml b/.github/workflows/ghcr-image-main.yaml
@@ -8,7 +8,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  IMAGE_TAG: main
+  IMAGE_TAG: latest
 
 jobs:
   build-and-publish-image:
@@ -22,23 +22,23 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # - name: Extract metadata (tags, labels) for Docker
-      #   id: meta
-      #   uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-      #   with:
-      #     images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/${{ env.IMAGE_NAME }}
+          tags: ${{ env.IMAGE_TAG }}
 
-      - name: Build and push Docker image
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      - name: Build and push Docker image to GHCR
+        uses: docker/build-push-action@v5
         with:
-          # context: .
+          context: .
           push: true
-          tags: ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
-          # labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.meta.outputs.tags }}
diff --git a/README.md b/README.md
@@ -39,9 +39,10 @@ To use Lemmy Modder - You can either:
 You will need:
 - docker & docker-compose
 
-1. Clone this repo `git clone https://github.com/tgxn/lemmy-modder.git`
-2. Switch to the repo directory `cd lemmy-modder`
-3. 
+Add this to your docker-compose:
+
+
+Setup your reverse proxy to proxy requests for `modder.example.com` to the new container on port `80`.
 
 ### Running Locally