ci: merge main to release

ci: merge main to release

Author: jennifer-richards

.github/workflows/build-celery-worker.yml

@@ -98,7 +98,7 @@ jobs:
         echo "IS_RELEASE=true" >> $GITHUB_ENV
         
     - name: Create Draft Release
-      uses: ncipollo/release-action@v1.16.0
+      uses: ncipollo/release-action@v1.18.0
       if: ${{ github.ref_name == 'release' }}
       with:
         prerelease: true
@@ -317,7 +317,7 @@ jobs:
         histCoveragePath: historical-coverage.json
 
     - name: Create Release
-      uses: ncipollo/release-action@v1.16.0
+      uses: ncipollo/release-action@v1.18.0
       if: ${{ env.SHOULD_DEPLOY == 'true' }}
       with:
         allowUpdates: true
@@ -330,7 +330,7 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Update Baseline Coverage
-      uses: ncipollo/release-action@v1.16.0
+      uses: ncipollo/release-action@v1.18.0
       if: ${{ github.event.inputs.updateCoverage == 'true' || github.ref_name == 'release' }}
       with:
         allowUpdates: true

.github/workflows/build.yml

@@ -9,6 +9,6 @@
     "@actions/core": "1.11.1",
     "@actions/github": "6.0.1",
     "lodash": "4.17.21",
-    "luxon": "3.6.1"
+    "luxon": "3.7.1"
   }
 }

dev/celery/Dockerfile

@@ -70,6 +70,7 @@ async function main () {
       .replace('__HOSTNAME__', hostname)
   )
   await fs.copy(path.join(basePath, 'docker/scripts/app-create-dirs.sh'), path.join(releasePath, 'app-create-dirs.sh'))
+  await fs.copy(path.join(basePath, 'docker/scripts/app-init-celery.sh'), path.join(releasePath, 'app-init-celery.sh'))
   await fs.copy(path.join(basePath, 'dev/deploy-to-container/start.sh'), path.join(releasePath, 'start.sh'))
   await fs.copy(path.join(basePath, 'test/data'), path.join(releasePath, 'test/data'))
   console.info('Updated configuration files.')
@@ -98,14 +99,6 @@ async function main () {
   })
   console.info('Pulled latest MQ docker image.')
 
-  // Pull latest Celery image
-  console.info('Pulling latest Celery docker image...')
-  const celeryImagePullStream = await dock.pull('ghcr.io/ietf-tools/datatracker-celery:latest')
-  await new Promise((resolve, reject) => {
-    dock.modem.followProgress(celeryImagePullStream, (err, res) => err ? reject(err) : resolve(res))
-  })
-  console.info('Pulled latest Celery docker image.')
-
   // Terminate existing containers
   console.info('Ensuring existing containers with same name are terminated...')
   const containers = await dock.listContainers({ all: true })
@@ -221,7 +214,7 @@ async function main () {
   const celeryContainers = {}
   for (const conConf of conConfs) {
     celeryContainers[conConf.name] = await dock.createContainer({
-      Image: 'ghcr.io/ietf-tools/datatracker-celery:latest',
+      Image: 'ghcr.io/ietf-tools/datatracker-app-base:latest',
       name: `dt-${conConf.name}-${branch}`,
       Hostname: `dt-${conConf.name}-${branch}`,
       Env: [
@@ -243,7 +236,7 @@ async function main () {
           Name: 'unless-stopped'
         }
       },
-      Cmd: ['--loglevel=INFO']
+      Entrypoint: ['bash', '-c', 'chmod +x ./app-init-celery.sh && ./app-init-celery.sh']
     })
   }
   console.info('Created Celery docker containers successfully.')

dev/coverage-action/package-lock.json

@@ -1,4 +1,4 @@
-FROM ghcr.io/ietf-tools/datatracker-celery:latest
+FROM ghcr.io/ietf-tools/datatracker-app-base:latest
 LABEL maintainer="IETF Tools Team <tools-discuss@ietf.org>"
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -34,7 +34,7 @@ RUN bash /tmp/library-scripts/docker-setup-python.sh "none" "/usr/local" "${PIPX
 RUN rm -rf /tmp/library-scripts
 
 # Copy the startup file
-COPY dev/celery/docker-init.sh /docker-init.sh
+COPY docker/scripts/app-init-celery.sh /docker-init.sh
 RUN sed -i 's/\r$//' /docker-init.sh && \
     chmod +x /docker-init.sh
 

dev/coverage-action/package.json

@@ -90,19 +90,22 @@ if [[ "${CELERY_ROLE}" == "worker" ]]; then
     run_as_celery_uid /usr/local/bin/python $WORKSPACEDIR/ietf/manage.py check
 fi
 
+USER_BIN_PATH="/home/dev/.local/bin"
+WATCHMEDO="$USER_BIN_PATH/watchmedo"
+CELERY="$USER_BIN_PATH/celery"
 trap 'trap "" TERM; cleanup' TERM
 # start celery in the background so we can trap the TERM signal
-if [[ -n "${DEV_MODE}" ]]; then
-  watchmedo auto-restart \
+if [[ -n "${DEV_MODE}" && -x "${WATCHMEDO}" ]]; then
+  $WATCHMEDO auto-restart \
             --patterns '*.py' \
             --directory 'ietf' \
             --recursive \
             --debounce-interval 5 \
             -- \
-            celery --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" $@ &
+            $CELERY --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" $@ &
   celery_pid=$!
 else
-  celery --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" "$@" &
+  $CELERY --app="${CELERY_APP:-ietf}" "${CELERY_OPTS[@]}" "$@" &
   celery_pid=$!
 fi