🔧 Updated workflows 🔧

.gitea/workflows/docker.yaml
.gitea/workflows/publish.yaml
.github/workflows/docker.yaml
.github/workflows/publish.yaml

.gitea/workflows/docker.yaml

@@ -6,7 +6,7 @@ on:
       - main
       - master
   schedule:
-    - cron: '0 2 * * 1'
+    - cron: '0 2 2 * *'
 
 jobs:
   build-and-push:
@@ -30,6 +30,7 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
+          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -83,3 +84,4 @@ jobs:
           tags: |
             docker.io/casjaysdev/archlinux:latest
             docker.io/casjaysdev/archlinux:${{ steps.meta.outputs.DATE_TAG }}
+            docker.io/casjaysdev/archlinux:${{ steps.meta.outputs.COMMIT_ID }}

.gitea/workflows/publish.yaml

@@ -6,7 +6,7 @@ on:
       - main
       - master
   schedule:
-    - cron: '0 2 2 * *'
+    - cron: '0 2 * * 1'
 
 jobs:
   build-and-push:
@@ -30,6 +30,7 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
+          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -55,9 +56,8 @@ jobs:
             org.opencontainers.image.authors=CasjaysDev <docker-admin@casjaysdev.pro>
             org.opencontainers.image.url=https://github.com/${{ github.repository }}
             org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.version=latest
+            org.opencontainers.image.version=base
             org.opencontainers.image.revision=${{ github.sha }}
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
-            docker.io/casjaysdev/archlinux:latest
+            docker.io/casjaysdev/archlinux:base
-            docker.io/casjaysdev/archlinux:${{ steps.meta.outputs.DATE_TAG }}

.github/workflows/docker.yaml

@@ -7,7 +7,7 @@ on:
       - master
   pull_request:
   schedule:
-    - cron: '0 2 * * 1'
+    - cron: '0 2 2 * *'
   workflow_dispatch:
 
 jobs:
@@ -31,6 +31,7 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
+          echo "COMMIT_ID=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -84,3 +85,4 @@ jobs:
           tags: |
             ghcr.io/${{ github.repository }}:latest
             ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.DATE_TAG }}
+            ghcr.io/${{ github.repository }}:${{ steps.meta.outputs.COMMIT_ID }}

.github/workflows/publish.yaml

@@ -1,4 +1,4 @@
-name: .-base
+name: archlinux-base
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
       - master
   pull_request:
   schedule:
-    - cron: '0 2 2 * *'
+    - cron: '0 2 * * 1'
   workflow_dispatch:
 
 jobs:
@@ -31,7 +31,6 @@ jobs:
         run: |
           echo "BUILD_DATE=$(date +'%Y%m%d%H%M')" >> $GITHUB_OUTPUT
           echo "DATE_TAG=$(date +'%y%m')" >> $GITHUB_OUTPUT
-          echo "IMAGE_REPO=${GITHUB_REPOSITORY}" >> $GITHUB_OUTPUT
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -43,45 +42,22 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
-          context: ./.
+          context: .
-          file: ././Dockerfile.base
+          file: ./Dockerfile.base
           platforms: |
             linux/amd64
             linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           provenance: false
-          build-args: |
-            IMAGE_NAME=.
-            IMAGE_VERSION=latest
-            IMAGE_REPO=${{ steps.meta.outputs.IMAGE_REPO }}
-            PHP_SERVER=.
-            BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
-            BUILD_VERSION=${{ steps.meta.outputs.BUILD_DATE }}
-            PULL_URL=.
-            DISTRO_VERSION=latest
-            CONTAINER_VERSION=
-            TIMEZONE=America/New_York
-            LANGUAGE=en_US.UTF-8
-            PHP_VERSION=system
-            NODE_VERSION=system
-            NODE_MANAGER=system
-            SERVICE_PORT=
-            EXPOSE_PORTS=
-            WWW_ROOT_DIR=/usr/local/share/httpd/default
-            DEFAULT_FILE_DIR=/usr/local/share/template-files
-            DEFAULT_DATA_DIR=/usr/local/share/template-files/data
-            DEFAULT_CONF_DIR=/usr/local/share/template-files/config
-            DEFAULT_TEMPLATE_DIR=/usr/local/share/template-files/defaults
           annotations: |
-            org.opencontainers.image.title=${{ steps.meta.outputs.IMAGE_REPO }}
+            org.opencontainers.image.title=${{ github.repository }}
-            org.opencontainers.image.description=Containerized version of ${{ steps.meta.outputs.IMAGE_REPO }}
+            org.opencontainers.image.description=Containerized version of ${{ github.repository }}
             org.opencontainers.image.vendor=CasjaysDev
             org.opencontainers.image.authors=CasjaysDev <docker-admin@casjaysdev.pro>
             org.opencontainers.image.url=https://github.com/${{ github.repository }}
             org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.version=latest
+            org.opencontainers.image.version=base
             org.opencontainers.image.revision=${{ github.sha }}
             org.opencontainers.image.created=${{ github.event.head_commit.timestamp }}
           tags: |
-            ghcr.io/${{ steps.meta.outputs.IMAGE_REPO }}:latest
+            ghcr.io/${{ github.repository }}:base
-            ghcr.io/${{ steps.meta.outputs.IMAGE_REPO }}:${{ steps.meta.outputs.DATE_TAG }}