WIP: DCS main into Gitea Main (for diff)

.changelog.yml

@@ -1,5 +1,5 @@
 # The full repository name
-repo: go-gitea/gitea
+repo: unfolding/dcs
 
 # Service type (gitea or github)
 service: github

.eslintignore

@@ -0,0 +1,2 @@
+templates/custom/footer.tmpl
+

.github/workflows/cron-licenses.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   cron-licenses:
     runs-on: ubuntu-latest
-    if: github.repository == 'go-gitea/gitea'
+    if: github.repository == 'unfoldingWord/dcs'
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
@@ -25,5 +25,5 @@ jobs:
           branch: main
           commit: true
           commit_message: "[skip ci] Updated licenses and gitignores"
-          remote: "git@github.com:go-gitea/gitea.git"
+          remote: "git@github.com:unfoldingWord/dcs.git"
           ssh_key: ${{ secrets.DEPLOY_KEY }}

.github/workflows/cron-lock.yml

@@ -15,7 +15,7 @@ concurrency:
 jobs:
   action:
     runs-on: ubuntu-latest
-    if: github.repository == 'go-gitea/gitea'
+    if: github.repository == 'unfoldingWord/dcs'
     steps:
       - uses: dessant/lock-threads@v4
         with:

.github/workflows/cron-translations.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   crowdin-pull:
     runs-on: ubuntu-latest
-    if: github.repository == 'go-gitea/gitea'
+    if: github.repository == 'unfoldingWord/dcs'
     steps:
       - uses: actions/checkout@v4
       - name: download from crowdin
@@ -29,11 +29,11 @@ jobs:
           branch: main
           commit: true
           commit_message: "[skip ci] Updated translations via Crowdin"
-          remote: "git@github.com:go-gitea/gitea.git"
+          remote: "git@github.com:unfoldingWord/dcs.git"
           ssh_key: ${{ secrets.DEPLOY_KEY }}
   crowdin-push:
     runs-on: ubuntu-latest
-    if: github.repository == 'go-gitea/gitea'
+    if: github.repository == 'unfoldingWord/dcs'
     steps:
       - uses: actions/checkout@v4
       - name: push translations to crowdin

.github/workflows/deploy-release.yml

@@ -0,0 +1,48 @@
+name: deploy-official-release-rootless
+
+on:
+  push:
+    tags: [ v**-dcs ]
+
+jobs:
+  release-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
+      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
+      - run: git fetch --unshallow --quiet --tags --force
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+      - name: Docker meta - create docker tags
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            unfoldingword/dcs
+          tags: |
+            type=match,pattern=v(\d+),group=1
+            type=match,pattern=v(\d+.\d+),group=1
+            type=match,pattern=v(\d+.\d+.\d+),group=1
+            type=match,pattern=v(.*)-dcs,group=1
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: build rootful docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+      # - name: build rootless docker image
+      #   uses: docker/build-push-action@v4
+      #   with:
+      #     context: .
+      #     platforms: linux/amd64,linux/arm64
+      #     push: true
+      #     file: Dockerfile.rootless
+      #     tags: unfoldingword/dcs:${{ steps.clean_name.outputs.branch }}-rootless

.github/workflows/pull-docker-dryrun.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: docker/build-push-action@v4
         with:
           push: false
-          tags: gitea/gitea:linux-amd64
+          tags: unfoldingword/dcs:linux-amd64
 
   rootless:
     if: needs.files-changed.outputs.docker == 'true' || needs.files-changed.outputs.actions == 'true'
@@ -32,4 +32,4 @@ jobs:
         with:
           push: false
           file: Dockerfile.rootless
-          tags: gitea/gitea:linux-amd64
+          tags: unfoldingword/dcs:linux-amd64

.github/workflows/release-nightly.yml

@@ -2,7 +2,7 @@ name: release-nightly
 
 on:
   push:
-    branches: [ main, release/v* ]
+    branches: [ main, release/dcs/v* ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,52 +11,52 @@ concurrency:
 jobs:
   disk-clean:
     uses: ./.github/workflows/disk-clean.yml
-  nightly-binary:
-    runs-on: nscloud
-    steps:
-      - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-          check-latest: true
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 20
-      - run: make deps-frontend deps-backend
-      # xgo build
-      - run: make release
-        env:
-          TAGS: bindata sqlite sqlite_unlock_notify
-      - name: import gpg key
-        id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v5
-        with:
-          gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
-          passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
-      - name: sign binaries
-        run: |
-          for f in dist/release/*; do
-            echo '${{ secrets.GPGSIGN_PASSPHRASE }}' | gpg --pinentry-mode loopback --passphrase-fd 0 --batch --yes --detach-sign -u ${{ steps.import_gpg.outputs.fingerprint }} --output "$f.asc" "$f"
-          done
-      # clean branch name to get the folder name in S3
-      - name: Get cleaned branch name
-        id: clean_name
-        run: |
-          REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
-          echo "Cleaned name is ${REF_NAME}"
-          echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT"
-      - name: configure aws
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-region: ${{ secrets.AWS_REGION }}
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      - name: upload binaries to s3
-        run: |
-          aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
+  # nightly-binary:
+  #   runs-on: nscloud
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     # fetch all commits instead of only the last as some branches are long lived and could have many between versions
+  #     # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
+  #     - run: git fetch --unshallow --quiet --tags --force
+  #     - uses: actions/setup-go@v4
+  #       with:
+  #         go-version-file: go.mod
+  #         check-latest: true
+  #     - uses: actions/setup-node@v3
+  #       with:
+  #         node-version: 20
+  #     - run: make deps-frontend deps-backend
+  #     # xgo build
+  #     - run: make release
+  #       env:
+  #         TAGS: bindata sqlite sqlite_unlock_notify
+  #     - name: import gpg key
+  #       id: import_gpg
+  #       uses: crazy-max/ghaction-import-gpg@v5
+  #       with:
+  #         gpg_private_key: ${{ secrets.GPGSIGN_KEY }}
+  #         passphrase: ${{ secrets.GPGSIGN_PASSPHRASE }}
+  #     - name: sign binaries
+  #       run: |
+  #         for f in dist/release/*; do
+  #           echo '${{ secrets.GPGSIGN_PASSPHRASE }}' | gpg --pinentry-mode loopback --passphrase-fd 0 --batch --yes --detach-sign -u ${{ steps.import_gpg.outputs.fingerprint }} --output "$f.asc" "$f"
+  #         done
+  #     # clean branch name to get the folder name in S3
+  #     - name: Get cleaned branch name
+  #       id: clean_name
+  #       run: |
+  #         REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
+  #         echo "Cleaned name is ${REF_NAME}"
+  #         echo "branch=${REF_NAME}" >> "$GITHUB_OUTPUT"
+  #     - name: configure aws
+  #       uses: aws-actions/configure-aws-credentials@v4
+  #       with:
+  #         aws-region: ${{ secrets.AWS_REGION }}
+  #         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  #         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  #     - name: upload binaries to s3
+  #       run: |
+  #         aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
   nightly-docker-rootful:
     runs-on: ubuntu-latest
     steps:
@@ -78,7 +78,7 @@ jobs:
             echo "branch=nightly" >> "$GITHUB_OUTPUT"
             exit 0
           fi
-          REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
+          REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/dcs\/v//'  -e 's/-dcs$//')
           echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
       - name: Login to Docker Hub
         uses: docker/login-action@v2
@@ -93,42 +93,82 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}
-  nightly-docker-rootless:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      # fetch all commits instead of only the last as some branches are long lived and could have many between versions
-      # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
-      - run: git fetch --unshallow --quiet --tags --force
-      - uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-          check-latest: true
-      - uses: docker/setup-qemu-action@v2
-      - uses: docker/setup-buildx-action@v2
-      - name: Get cleaned branch name
-        id: clean_name
-        run: |
-          # if main then say nightly otherwise cleanup name
-          if [ "${{ github.ref }}" = "refs/heads/main" ]; then
-            echo "branch=nightly" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
-          echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: fetch go modules
-        run: make vendor
-      - name: build rootless docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          file: Dockerfile.rootless
-          tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}-rootless
+          tags: unfoldingword/dcs:${{ steps.clean_name.outputs.branch }}
+#   nightly-docker-rootless:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v4
+#       # fetch all commits instead of only the last as some branches are long lived and could have many between versions
+#       # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
+#       - run: git fetch --unshallow --quiet --tags --force
+#       - uses: actions/setup-go@v4
+#         with:
+#           go-version: "~1.21"
+#           check-latest: true
+#       - uses: docker/setup-qemu-action@v2
+#       - uses: docker/setup-buildx-action@v2
+#       - name: Get cleaned branch name
+#         id: clean_name
+#         run: |
+#           # if main then say nightly otherwise cleanup name
+#           if [ "${{ github.ref }}" = "refs/heads/main" ]; then
+#             echo "branch=nightly" >> "$GITHUB_OUTPUT"
+#             exit 0
+#           fi
+#           REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
+#           echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
+#       - name: Login to Docker Hub
+#         uses: docker/login-action@v2
+#         with:
+#           username: ${{ secrets.DOCKERHUB_USERNAME }}
+#           password: ${{ secrets.DOCKERHUB_TOKEN }}
+#       - name: fetch go modules
+#         run: make vendor
+#       - name: build rootless docker image
+#         uses: docker/build-push-action@v4
+#         with:
+#           context: .
+#           platforms: linux/amd64,linux/arm64
+#           push: true
+#           file: Dockerfile.rootless
+#           tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}-rootless
+# =======
+#           tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}
+#   nightly-docker-rootless:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v4
+#       # fetch all commits instead of only the last as some branches are long lived and could have many between versions
+#       # fetch all tags to ensure that "git describe" reports expected Gitea version, eg. v1.21.0-dev-1-g1234567
+#       - run: git fetch --unshallow --quiet --tags --force
+#       - uses: actions/setup-go@v4
+#         with:
+#           go-version-file: go.mod
+#           check-latest: true
+#       - uses: docker/setup-qemu-action@v2
+#       - uses: docker/setup-buildx-action@v2
+#       - name: Get cleaned branch name
+#         id: clean_name
+#         run: |
+#           # if main then say nightly otherwise cleanup name
+#           if [ "${{ github.ref }}" = "refs/heads/main" ]; then
+#             echo "branch=nightly" >> "$GITHUB_OUTPUT"
+#             exit 0
+#           fi
+#           REF_NAME=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\///' -e 's/refs\/tags\///' -e 's/release\/v//')
+#           echo "branch=${REF_NAME}-nightly" >> "$GITHUB_OUTPUT"
+#       - name: Login to Docker Hub
+#         uses: docker/login-action@v2
+#         with:
+#           username: ${{ secrets.DOCKERHUB_USERNAME }}
+#           password: ${{ secrets.DOCKERHUB_TOKEN }}
+#       - name: fetch go modules
+#         run: make vendor
+#       - name: build rootless docker image
+#         uses: docker/build-push-action@v4
+#         with:
+#           context: .
+#           platforms: linux/amd64,linux/arm64
+#           push: true
+#           file: Dockerfile.rootless
+#           tags: gitea/gitea:${{ steps.clean_name.outputs.branch }}-rootless

.gitignore

@@ -54,7 +54,9 @@ cpu.out
 /dist
 /custom/*
 !/custom/conf/app.example.ini
+!/custom/bin
 /data
+/data-*
 /indexers
 /log
 /public/img/avatar
@@ -110,3 +112,9 @@ prime/
 
 # Manpage
 /man
+
+# Docker compose
+/mysql
+/data-main
+/data-release
+.history

Dockerfile

@@ -5,7 +5,7 @@ ARG GOPROXY
 ENV GOPROXY ${GOPROXY:-direct}
 
 ARG GITEA_VERSION
-ARG TAGS="sqlite sqlite_unlock_notify"
+ARG TAGS="sqlite sqlite_unlock_notify sqlite_json"
 ENV TAGS "bindata timetzdata $TAGS"
 ARG CGO_EXTRA_CFLAGS
 
@@ -41,6 +41,9 @@ RUN apk --no-cache add \
     su-exec \
     gnupg
 
+#For DCS local scripts
+RUN apk --no-cache add jq yq
+
 RUN addgroup \
     -S -g 1000 \
     git && \