Add CI action to push images to Docker Hub

.github/workflows/acceptance-test.yml

@@ -1,11 +1,18 @@
 ---
 name: "Acceptance Test"
 on:
+  workflow_dispatch:
+    inputs:
+      am_version:
+        description: "Archivematica ref (branch, tag or SHA to checkout)"
+        default: "qa/1.x"
+        required: true
+        type: "string"
   pull_request:
     types: [labeled]
 jobs:
   test:
-    if: github.event.label.name == 'AMAUAT'
+    if: "${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && github.event.label.name == 'AMAUAT') }}"
     name: "Test ${{ matrix.tag }} on ${{ matrix.browser }}"
     runs-on: "ubuntu-22.04"
     strategy:
@@ -30,9 +37,16 @@ jobs:
             browser: Firefox
     steps:
       - name: "Check out repository"
+        if: "${{ github.event_name != 'workflow_dispatch' }}"
         uses: "actions/checkout@v4"
         with:
           submodules: true
+      - name: "Check out repository (manually triggered)"
+        if: "${{ github.event_name == 'workflow_dispatch' }}"
+        uses: "actions/checkout@v4"
+        with:
+          ref: "${{ inputs.am_version || 'qa/1.x' }}"
+          submodules: true
       - name: "Create external volumes"
         run: |
           make -C hack/ create-volumes

.github/workflows/push-images.yml

@@ -0,0 +1,46 @@
+name: "Push images to Docker Hub"
+on: workflow_dispatch
+jobs:
+  build:
+    name: "Build and push images"
+    runs-on: "ubuntu-22.04"
+    steps:
+      - name: "Check out repository"
+        uses: "actions/checkout@v4"
+      - name: "Set up buildx"
+        uses: "docker/setup-buildx-action@v3"
+        with:
+          version: latest
+          driver-opts: image=moby/buildkit:v0.13.0
+      - name: "Login to Docker Hub"
+        uses: docker/login-action@v3
+        with:
+          username: artefactual
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      - name: "Build and Push Dashboard"
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          load: true
+          file: ./hack/Dockerfile
+          target: "archivematica-dashboard"
+          tags: artefactual/archivematica-dashboard:latest
+      - name: "Build and Push MCPClient"
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          load: true
+          file: ./hack/Dockerfile
+          target: "archivematica-mcp-client"
+          tags: artefactual/archivematica-mcp-client:latest
+      - name: "Build and Push MCPServer"
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          load: true
+          file: ./hack/Dockerfile
+          target: "archivematica-mcp-server"
+          tags: artefactual/archivematica-mcp-server:latest

.github/workflows/test.yml

@@ -1,6 +1,13 @@
 ---
 name: "Test"
 on:
+  workflow_dispatch:
+    inputs:
+      am_version:
+        description: "Archivematica ref (branch, tag or SHA to checkout)"
+        default: "qa/1.x"
+        required: true
+        type: "string"
   pull_request:
   push:
     branches:
@@ -38,7 +45,13 @@ jobs:
             python-version: "3.9"
     steps:
       - name: "Check out repository"
+        if: "${{ github.event_name != 'workflow_dispatch' }}"
         uses: "actions/checkout@v4"
+      - name: "Check out repository (manually triggered)"
+        if: "${{ github.event_name == 'workflow_dispatch' }}"
+        uses: "actions/checkout@v4"
+        with:
+          ref: "${{ inputs.am_version || 'qa/1.x' }}"
       - name: "Check out the archivematica-storage-service submodule"
         run: |
           git submodule update --init hack/submodules/archivematica-storage-service/
@@ -97,7 +110,13 @@ jobs:
         working-directory: "./src/dashboard/frontend/"
     steps:
       - name: "Check out repository"
+        if: "${{ github.event_name != 'workflow_dispatch' }}"
+        uses: "actions/checkout@v4"
+      - name: "Check out repository (manually triggered)"
+        if: "${{ github.event_name == 'workflow_dispatch' }}"
         uses: "actions/checkout@v4"
+        with:
+          ref: "${{ inputs.am_version || 'qa/1.x' }}"
       - name: "Set up Node JS"
         uses: "actions/setup-node@v4"
         with:
@@ -116,7 +135,13 @@ jobs:
     runs-on: "ubuntu-22.04"
     steps:
       - name: "Check out repository"
+        if: "${{ github.event_name != 'workflow_dispatch' }}"
+        uses: "actions/checkout@v4"
+      - name: "Check out repository (manually triggered)"
+        if: "${{ github.event_name == 'workflow_dispatch' }}"
         uses: "actions/checkout@v4"
+        with:
+          ref: "${{ inputs.am_version || 'qa/1.x' }}"
       - name: "Set up Python 3.9"
         uses: "actions/setup-python@v5"
         with:

.pre-commit-config.yaml

@@ -9,35 +9,19 @@ repos:
         src/MCPServer/lib/assets/.*\.json|
         src/(MCPClient/MCPServer|dashboard)/osdeps/.*\.json
       )
-- repo: https://github.com/asottile/pyupgrade
-  rev: v3.15.2
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.4.5
   hooks:
-  - id: pyupgrade
-    args: [--py38-plus]
-- repo: https://github.com/asottile/reorder_python_imports
-  rev: v3.12.0
-  hooks:
-  - id: reorder-python-imports
-    args: [--py38-plus]
+  - id: ruff
+    args: [--fix, --exit-non-zero-on-fix]
+  - id: ruff-format
 - repo: https://github.com/adamchainz/django-upgrade
-  rev: "1.16.0"
+  rev: "1.17.0"
   hooks:
   - id: django-upgrade
     args: [--target-version, "4.2"]
-- repo: https://github.com/psf/black
-  rev: "23.12.1"
-  hooks:
-  - id: black
-    args: [--safe, --quiet]
-- repo: https://github.com/pycqa/flake8
-  rev: "7.0.0"
-  hooks:
-  - id: flake8
-    additional_dependencies:
-    - flake8-bugbear==24.2.6
-    - flake8-comprehensions==3.14.0
 - repo: https://github.com/igorshubovych/markdownlint-cli
-  rev: v0.39.0
+  rev: v0.41.0
   hooks:
   - id: markdownlint
     exclude: |

hack/Dockerfile

@@ -144,11 +144,67 @@ ENTRYPOINT ["npm", "run", "test-single-run"]
 
 # -----------------------------------------------------------------------------
 
-FROM base-builder as base
+FROM ubuntu:${UBUNTU_VERSION} AS base
 
-ARG USER_ID=1000
-ARG GROUP_ID=1000
 ARG PYENV_DIR=/pyenv
+ARG USER_ID
+ARG GROUP_ID
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV PYTHONUNBUFFERED 1
+
+RUN set -ex \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		ca-certificates \
+		# gnupg \
+		# curl \
+		# git \
+		# libldap2-dev \
+		libmysqlclient-dev \
+		# libsasl2-dev \
+		# libsqlite3-dev \
+		locales \
+		# pkg-config \
+		tzdata \
+	&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ENV PYENV_ROOT=${PYENV_DIR}/data
+ENV PATH=$PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
+
+RUN set -ex \
+	&& groupadd --gid ${GROUP_ID} --system archivematica \
+	&& useradd --uid ${USER_ID} --gid ${GROUP_ID} --home-dir /var/archivematica --system archivematica \
+	&& mkdir -p /var/archivematica/sharedDirectory \
+	&& chown -R archivematica:archivematica /var/archivematica
+
+USER archivematica
+
+COPY --chown=${USER_ID}:${GROUP_ID} --from=pyenv-builder --link ${PYENV_DIR} ${PYENV_DIR}
+COPY --chown=${USER_ID}:${GROUP_ID} --link . /src
+
+
+# -----------------------------------------------------------------------------
+
+FROM base AS archivematica-mcp-client
+
+USER root
+
+RUN set -ex \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		gnupg \
+		 curl \
+	&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+# Purge
+#	- gnupg
+#	- git
 
 RUN set -ex \
 	&& curl --retry 3 -fsSL https://packages.archivematica.org/1.16.x/key.asc | gpg --dearmor -o /etc/apt/keyrings/archivematica-1.16.x.gpg \
@@ -159,66 +215,37 @@ RUN set -ex \
 	&& apt-get install -y --no-install-recommends \
 		atool \
 		bulk-extractor \
-		clamav \
-		coreutils \
 		ffmpeg \
 		fits \
-		g++ \
-		gcc \
 		gearman \
-		gettext \
 		ghostscript \
 		hashdeep \
 		imagemagick \
 		inkscape \
 		jhove \
-		libffi-dev \
 		libimage-exiftool-perl \
-		libldap2-dev \
-		libmysqlclient-dev \
-		libsasl2-dev \
-		libssl-dev \
-		libxml2-dev \
-		libxslt1-dev \
 		logapp \
 		md5deep \
+		nailgun \
 		mediaconch \
 		mediainfo \
-		nailgun \
 		nfs-common \
 		openjdk-8-jre-headless \
 		p7zip-full \
 		pbzip2 \
 		pst-utils \
-		python3-lxml \
 		rsync \
 		siegfried \
 		sleuthkit \
 		tesseract-ocr \
 		tree \
-		unar \
 		unrar-free \
 		uuid \
+		ssh \
 	&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
 
-RUN set -ex \
-	&& groupadd --gid ${GROUP_ID} --system archivematica \
-	&& useradd --uid ${USER_ID} --gid ${GROUP_ID} --home-dir /var/archivematica --system archivematica \
-	&& mkdir -p /var/archivematica/sharedDirectory \
-	&& chown -R archivematica:archivematica /var/archivematica
-
-# Download ClamAV virus signatures
-RUN freshclam --quiet
-
 USER archivematica
 
-COPY --chown=${USER_ID}:${GROUP_ID} --from=pyenv-builder --link ${PYENV_DIR} ${PYENV_DIR}
-COPY --chown=${USER_ID}:${GROUP_ID} --link . /src
-
-# -----------------------------------------------------------------------------
-
-FROM base AS archivematica-mcp-client
-
 ENV DJANGO_SETTINGS_MODULE settings.common
 ENV PYTHONPATH /src/src/MCPClient/lib/:/src/src/MCPClient/lib/clientScripts:/src/src/archivematicaCommon/lib/:/src/src/dashboard/src/
 ENV ARCHIVEMATICA_MCPCLIENT_ARCHIVEMATICACLIENTMODULES /src/src/MCPClient/lib/archivematicaClientModules
@@ -251,6 +278,18 @@ ARG PYTHON_VERSION=3.9
 
 USER root
 
+RUN set -ex \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		# g++ \
+		gettext \
+		libffi-dev \
+		libxml2-dev \
+		libxslt1-dev \
+		unar \
+		libssl-dev \
+	&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
 RUN set -ex \
 	&& internalDirs=' \
 		/src/src/dashboard/frontend \
@@ -284,7 +323,33 @@ ENTRYPOINT ["pyenv", "exec", "python3", "-m", "gunicorn", "--config=/src/src/das
 
 # -----------------------------------------------------------------------------
 
-FROM base AS archivematica-tests
+FROM base-builder as archivematica-tests
+
+ARG USER_ID
+ARG GROUP_ID
+ARG PYENV_DIR
+
+RUN set -ex \
+	&& curl --retry 3 -fsSL https://packages.archivematica.org/1.16.x/key.asc | gpg --dearmor -o /etc/apt/keyrings/archivematica-1.16.x.gpg \
+	&& echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.16.x.gpg] http://packages.archivematica.org/1.16.x/ubuntu-externals jammy main" > /etc/apt/sources.list.d/archivematica-external.list \
+	&& curl --retry 3 -so /tmp/repo-mediaarea_1.0-21_all.deb -L https://mediaarea.net/repo/deb/repo-mediaarea_1.0-21_all.deb \
+	&& dpkg -i /tmp/repo-mediaarea_1.0-21_all.deb \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends \
+		gcc \
+		media-types \
+		p7zip-full \
+		pbzip2 \
+		pst-utils \
+		python3-lxml \
+		rsync \
+		unar \
+	&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+USER archivematica
+
+COPY --chown=${USER_ID}:${GROUP_ID} --from=pyenv-builder --link ${PYENV_DIR} ${PYENV_DIR}
+COPY --chown=${USER_ID}:${GROUP_ID} --link . /src
 
 # -----------------------------------------------------------------------------