Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Ubuntu to 22.04 #1838

Merged
merged 3 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions hack/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG TARGET=archivematica-mcp-server

FROM ubuntu:18.04 AS base
FROM ubuntu:22.04 AS base

ARG USER_ID=1000
ARG GROUP_ID=1000
Expand Down Expand Up @@ -47,14 +47,14 @@ COPY src/MCPServer/osdeps /src/src/MCPServer/osdeps
COPY src/MCPClient/osdeps /src/src/MCPClient/osdeps
RUN set -ex \
&& curl -s https://packages.archivematica.org/GPG-KEY-archivematica | apt-key add - \
&& add-apt-repository --no-update --yes "deb [arch=amd64] http://packages.archivematica.org/1.14.x/ubuntu-externals bionic main" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ bionic multiverse" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ bionic-security universe" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ bionic-updates multiverse" \
&& add-apt-repository --no-update --yes "deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu-externals jammy main" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy multiverse" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy-security universe" \
&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ jammy-updates multiverse" \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
libyaml-dev clamav \
&& /src/hack/osdeps.py Ubuntu-18 1 | grep -v -E "nginx|postfix" | xargs apt-get install -y --no-install-recommends \
&& /src/hack/osdeps.py Ubuntu-22 1 | grep -v -E "nginx|postfix|python3.6-dev" | xargs apt-get install -y --no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

# Download ClamAV virus signatures
Expand Down
141 changes: 141 additions & 0 deletions src/MCPClient/osdeps/Ubuntu-22.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
{
"_comments": [
"Add any comments here",
"Include here keys, repos, and packages required by this component"
],
"osdeps_packages": [
{
"name": "atool",
"state": "latest"
},
{
"name": "bulk-extractor",
"state": "latest"
},
{
"name": "ffmpeg",
"state": "latest"
},
{
"name": "fits",
"state": "latest"
},
{
"name": "gearman",
"state": "latest"
},
{
"name": "ghostscript",
"state": "latest"
},
{
"name": "hashdeep",
"state": "latest"
},
{
"name": "imagemagick",
"state": "latest"
},
{
"name": "inkscape",
"state": "latest"
},
{
"name": "jhove",
"state": "latest"
},
{
"name": "libimage-exiftool-perl",
"state": "latest"
},
{
"name": "logapp",
"state": "latest"
},
{
"name": "md5deep",
"state": "latest"
},
{
"name": "nailgun",
"state": "latest"
},
{
"name": "mediaconch",
"state": "latest"
},
{
"name": "mediainfo",
"state": "latest"
},
{
"name": "nfs-common",
"state": "latest"
},
{
"name": "openjdk-8-jre-headless",
"state": "latest"
},
{
"name": "p7zip-full",
"state": "latest"
},
{
"name": "pbzip2",
"state": "latest"
},
{
"name": "postfix",
"state": "latest"
},
{
"name": "pst-utils",
"state": "latest"
},
{
"name": "rsync",
"state": "latest"
},
{
"name": "siegfried",
"state": "latest"
},
{
"name": "sleuthkit",
"state": "latest"
},
{
"name": "tesseract-ocr",
"state": "latest"
},
{
"name": "tree",
"state": "latest"
},
{
"name": "unrar-free",
"state": "latest"
},
{
"name": "uuid",
"state": "latest"
},
{
"name": "libmysqlclient-dev",
"state": "latest"
}
],
"osdeps_repokeys": [
{
"id": "0x5236CA08",
"url": "https://packages.archivematica.org/GPG-KEY-archivematica",
"validate_certs": "no"
}
],
"osdeps_repos": [
"deb [arch=amd64] http://packages.archivematica.org/1.15.x/ubuntu-externals jammy main",
"deb http://archive.ubuntu.com/ubuntu/ jammy multiverse",
"deb http://archive.ubuntu.com/ubuntu/ jammy-security universe",
"deb http://archive.ubuntu.com/ubuntu/ jammy-updates multiverse"
]
}
14 changes: 14 additions & 0 deletions src/MCPServer/osdeps/Ubuntu-22.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"_comments": [
"Add any comments here",
"Include here keys, repos, and packages required by this component"
],
"osdeps_packages": [
{
"name": "libmysqlclient-dev",
"state": "latest"
}
],
"osdeps_repokeys": [],
"osdeps_repos": []
}
67 changes: 67 additions & 0 deletions src/dashboard/osdeps/Ubuntu-22.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"_comments": [
"Add any comments here",
"Include here keys, repos, and packages required by this component",
"libsasl2-dev, libldap2-dev: required to pip install python-ldap in virtualenv"
],
"osdeps_packages": [
{
"name": "gcc",
"state": "latest"
},
{
"name": "g++",
"state": "latest"
},
{
"name": "gettext",
"state": "latest"
},
{
"name": "nginx",
"state": "latest"
},
{
"name": "libffi-dev",
"state": "latest"
},
{
"name": "libxml2-dev",
"state": "latest"
},
{
"name": "libxslt1-dev",
"state": "latest"
},
{
"name": "libssl-dev",
"state": "latest"
},
{
"name": "python3.6-dev",
"state": "latest"
},
{
"name": "libsasl2-dev",
"state": "latest"
},
{
"name": "libldap2-dev",
"state": "latest"
},
{
"name": "unar",
"state": "latest"
},
{
"name": "coreutils",
"state": "latest"
},
{
"name": "libmysqlclient-dev",
"state": "latest"
}
],
"osdeps_repokeys": [],
"osdeps_repos": []
}
Loading