Use gitea not gitee

Override uid/gid of files created in the data dir

drone/docker-compose.yml

@@ -0,0 +1,32 @@
+# Deploy drone CI system
+
+services:
+  drone:
+    image: drone/drone:2
+    environment:
+      - DRONE_GITEA_SERVER=http://gitea.local
+      - DRONE_GITEA_CLIENT_ID=put_the_real_client_id_here
+      - DRONE_GITEA_CLIENT_SECRET=put_the_real_secret_here
+      - DRONE_RPC_SECRET=super-duper-secret
+      - DRONE_SERVER_HOST=gitea.local # TODO: make this more generic
+      - DRONE_SERVER_PROTO=http
+    restart: always
+    volumes:
+      - ./drone:/data
+    ports:
+      - 80
+      - 443
+
+  drone-runner:
+    image: drone/drone-runner-docker:1
+    environment:
+      - DRONE_RPC_PROTO=http
+      - DRONE_RPC_HOST=drone
+      - DRONE_RPC_SECRET=super-duper-secret
+      -  DRONE_RUNNER_CAPACITY=2
+      - DRONE_RUNNER_NAME=drone-runner-1
+    restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    ports:
+      - 3000

drone/run-this-first.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
+    set -x
+fi
+mkdir -p ./drone

gitea/README.md

@@ -1,3 +1,7 @@
-## Manual deployment notes
+## Deployment notes
 ### Gitea
-1. Create admin user in web UI on initial setup
+1. `cd ./gitea`
+1. Run the script `./run-this-first.sh`
+1. Bring up the gitea cluster `docker compose up -d`
+1. Run the script `./initialize-gitea.sh`
+1. Note the access token printed, it will be needed to publish packages.

gitea/docker-compose.yml

@@ -1,13 +1,13 @@
 version: "3"
-
+# TODO: remove version since it is now redundant
+#       remove this network definition unless there's a reason for it
 networks:
   gitea:
     external: false
 
 services:
   server:
-    image: gitea/gitea:1.17.1
-    container_name: gitea
+    image: gitea/gitea:1.18.3
     environment:
       - USER_UID=1000
       - USER_GID=1000
@@ -16,6 +16,10 @@ services:
       - GITEA__database__NAME=gitea
       - GITEA__database__USER=gitea
       - GITEA__database__PASSWD=gitea
+      - GITEA__server__HTTP_PORT=3000
+      - GITEA__server__LOCAL_ROOT_URL=http://gitea.local:3000/
+      - GITEA__server__ROOT_URL=http://gitea.local:3000/
+      - GITEA__security__INSTALL_LOCK=true
     restart: always
     networks:
       - gitea
@@ -37,6 +41,9 @@ services:
       - POSTGRES_USER=gitea
       - POSTGRES_PASSWORD=gitea
       - POSTGRES_DB=gitea
+    # Workaround below for lack of docker uid mapping. Change the container's postgres user's uid/gid to match the host user's
+    entrypoint: bash
+    command: -c  'usermod -u ${CERC_HOST_UID:-1000} postgres;groupmod -g ${CERC_HOST_GID:-1000} postgres;exec /usr/local/bin/docker-entrypoint.sh postgres'
     networks:
       - gitea
     volumes:

gitea/initialize-gitea.sh

@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# Run this script once after bringing up gitea in docker compose
+# TODO: add a check to detect that gitea has not fully initialized yet (no user relation error)
+GITEA_USER=gitea_admin
+GITEA_PASSWORD=admin1234
+GITEA_USER_EMAIL=${GITEA_USER}@example.com
+GITEA_NEW_ORGANIZATION=cerc-io
+GITEA_URL_PREFIX=http://localhost:3000
+CERC_GITEA_TOKEN_NAME=laconic-so-publication-token
+if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
+    set -x
+fi
+# Create admin user
+# First check if it already exists
+if [[ -z ${CERC_SO_COMPOSE_PROJECT} ]] ; then
+    compose_command="docker compose"
+else
+    compose_command="docker compose -p ${CERC_SO_COMPOSE_PROJECT}"
+fi
+# HACK: sleep a bit because gitea may not be up yet (container reports it has started before service is available)
+sleep 5
+${compose_command} exec --user git server gitea admin user list --admin | grep -v -e "^ID" | awk '{ print $2 }' | grep ${GITEA_USER} > /dev/null
+if [[ $? == 1 ]] ; then
+    # Then create if it wasn't found
+    ${compose_command} exec --user git server gitea admin user create --admin --username ${GITEA_USER} --password ${GITEA_PASSWORD} --email ${GITEA_USER_EMAIL}
+fi
+# HACK: sleep a bit because if we don't gitea will return empty responses
+sleep 5
+# Check if the token already exists
+token_response=$( curl -s "${GITEA_URL_PREFIX}/api/v1/users/${GITEA_USER}/tokens" \
+  -u ${GITEA_USER}:${GITEA_PASSWORD} \
+  -H "Content-Type: application/json")
+if [[ -n ${token_response} ]] ; then
+    echo ${token_response}  | jq --exit-status -r 'to_entries[] | select(.value.name == "'${CERC_GITEA_TOKEN_NAME}'")'
+    if [[ $? == 0 ]] ; then
+        token_found=1
+    fi
+fi
+if [[ ${token_found} != 1 ]] ; then
+    # Create access token if not found
+    # Note that we either create the token here, or we needed to be passed 
+    # the token by the caller. This is because gitea won't release the token
+    # plaintext post-creation.
+    new_gitea_token=$( curl -s -X POST "${GITEA_URL_PREFIX}/api/v1/users/${GITEA_USER}/tokens" \
+      -u ${GITEA_USER}:${GITEA_PASSWORD} \
+      -H "Content-Type: application/json" \
+      -d '{"name":"'${CERC_GITEA_TOKEN_NAME}'"}' \
+      | jq -r .sha1 )
+    echo "This is your gitea access token: ${new_gitea_token}. Keep it safe and secure, it can not be fetched again from gitea."
+    echo "To use with laconic-so set this environment variable: export CERC_NPM_AUTH_TOKEN=${new_gitea_token}"
+    CERC_GITEA_AUTH_TOKEN=${new_gitea_token}
+else
+    # If the token exists, then we must have been passed its value.
+    # If we were not, then we fail hard here.
+    if [[ -z ${CERC_GITEA_AUTH_TOKEN} ]] ; then
+        echo "FATAL error: gitea auth token \"${CERC_GITEA_TOKEN_NAME}\" already exists but no CERC_GITEA_AUTH_TOKEN was provided"
+        exit 1
+    fi
+fi
+# Now that we're sure the token exists and is set in CERC_GITEA_AUTH_TOKEN,
+# we can proceed with token-authenticated API requests below
+# Create org
+# First check if it already exists
+curl -s "${GITEA_URL_PREFIX}/api/v1/admin/users/${GITEA_USER}/orgs" \
+  -H "Authorization: token ${CERC_GITEA_AUTH_TOKEN}" \
+  -H "Content-Type: application/json" \
+  -H  "accept: application/json" \
+  | jq --exit-status -r 'to_entries[] | select(.value.name == "'${GITEA_NEW_ORGANIZATION}'")' > /dev/null
+if [[ $? != 0 ]] ; then
+    # If it doesn't exist, create it
+    # See: https://discourse.gitea.io/t/create-remove-organization-through-api/478
+    curl -s -X POST "${GITEA_URL_PREFIX}/api/v1/admin/users/${GITEA_USER}/orgs" \
+      -H "Authorization: token ${CERC_GITEA_AUTH_TOKEN}" \
+      -H "Content-Type: application/json" \
+      -H  "accept: application/json" \
+      -d '{"username": "'${GITEA_NEW_ORGANIZATION}'"}' > /dev/null
+    echo "Created the organization ${GITEA_NEW_ORGANIZATION}"
+fi
+echo "Gitea was configured to use host name: gitea.local, ensure that this resolves to localhost, e.g. with sudo vi /etc/hosts"
+echo "Success, gitea is properly initialized"

gitea/run-this-first.sh

@@ -1,3 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
+if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
+    set -x
+fi
 mkdir -p ./gitea
-mkdir -p ./postgres
+mkdir -p ./gitea/ssh