From 618c3a8b81056e451841760ef04ce4cdc123e90c Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Thu, 4 Jul 2024 14:11:13 +0000 Subject: [PATCH 1/3] Fix casing warning in Dockerfile --- hack/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/Dockerfile b/hack/Dockerfile index bcef69af74..e524373a68 100644 --- a/hack/Dockerfile +++ b/hack/Dockerfile @@ -144,7 +144,7 @@ ENTRYPOINT ["npm", "run", "test-single-run"] # ----------------------------------------------------------------------------- -FROM base-builder as base +FROM base-builder AS base ARG USER_ID=1000 ARG GROUP_ID=1000 From 2287a371aa3b8c50931ca7fe28bae4dc5c944c78 Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Thu, 4 Jul 2024 14:16:15 +0000 Subject: [PATCH 2/3] Extract mediaarea repo version --- hack/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hack/Dockerfile b/hack/Dockerfile index e524373a68..6f44d652b0 100644 --- a/hack/Dockerfile +++ b/hack/Dockerfile @@ -6,6 +6,7 @@ ARG PYTHON_VERSION=3.9 ARG NODE_VERSION=20 ARG PYENV_DIR=/pyenv ARG SELENIUM_DIR=/selenium +ARG MEDIAAREA_VERSION=1.0-21 # ----------------------------------------------------------------------------- @@ -149,12 +150,14 @@ FROM base-builder AS base ARG USER_ID=1000 ARG GROUP_ID=1000 ARG PYENV_DIR=/pyenv +ARG MEDIAAREA_VERSION 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 \ + && curl --retry 3 -so /tmp/repo-mediaarea.deb -L https://mediaarea.net/repo/deb/repo-mediaarea_${MEDIAAREA_VERSION}_all.deb \ + && dpkg -i /tmp/repo-mediaarea.deb \ + && rm /tmp/repo-mediaarea.deb \ && apt-get update \ && apt-get install -y --no-install-recommends \ atool \ From ef8de0cefa99d25128625a14e79011c940c4953c Mon Sep 17 00:00:00 2001 From: "Douglas Cerna (Soy Douglas)" Date: Thu, 4 Jul 2024 14:16:49 +0000 Subject: [PATCH 3/3] Update mediaarea repo version --- hack/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/Dockerfile b/hack/Dockerfile index 6f44d652b0..3bcd18c534 100644 --- a/hack/Dockerfile +++ b/hack/Dockerfile @@ -6,7 +6,7 @@ ARG PYTHON_VERSION=3.9 ARG NODE_VERSION=20 ARG PYENV_DIR=/pyenv ARG SELENIUM_DIR=/selenium -ARG MEDIAAREA_VERSION=1.0-21 +ARG MEDIAAREA_VERSION=1.0-24 # -----------------------------------------------------------------------------