[nongnu] elpa/pdf-tools a243f410a0 2/4: Update the current Dockerfile te

emacs-elpa-diffs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/pdf-tools a243f410a0 2/4: Update the current Dockerfile te

From:	ELPA Syncer
Subject:	[nongnu] elpa/pdf-tools a243f410a0 2/4: Update the current Dockerfile templates
Date:	Sat, 21 May 2022 20:58:34 -0400 (EDT)

branch: elpa/pdf-tools
commit a243f410a04738128004e420eb828db026749943
Author: Vedang Manerikar <ved.manerikar@gmail.com>
Commit: Vedang Manerikar <ved.manerikar@gmail.com>

    Update the current Dockerfile templates
    
    - Move all package installation to the autobuild file.
      The Dockerfile should simply start a container and make sure that
      all the package repositories are updated.
    
    - Dockerfiles should spin up containers for the latest (ish) releases
      of the major Linux operating systems.
    
    - Disable Dockerfiles for environments which are not working
      correctly.
    
    List of operating systems where `epdfinfo` server compilation is
    tested and working correctly:
    - Debian (9, 10, 11)
    - Ubuntu (18, 20, 22)
    - Fedora (34, 35, 36)
    
    List of operating systems where `epdfinfo` server compilation is
    failing inside the containers, for unknown reasons:
    - Gentoo
    - Centos
    - Archlinux
    
    List of operating systems that need to be added to containerized
    testing:
    - MacOSX
    - Windows via Msys2 (Mingw32, Mingw64)
    - OpenBSD
    - FreeBSD
    - NixOS
    - Void
    - OpenSuse
    
    Relates to: #98
---
 server/autobuild                                          | 1 +
 server/test/docker/templates/arch.Dockerfile.in           | 4 ----
 server/test/docker/templates/arch.Dockerfile.in.FAILING   | 4 ++++
 server/test/docker/templates/centos-7.Dockerfile.in       | 3 ---
 server/test/docker/templates/centos.Dockerfile.in.FAILING | 6 ++++++
 server/test/docker/templates/debian-10.Dockerfile.in      | 3 ++-
 server/test/docker/templates/debian-11.Dockerfile.in      | 4 ++++
 server/test/docker/templates/debian-8.Dockerfile.in       | 3 ---
 server/test/docker/templates/debian-9.Dockerfile.in       | 3 ++-
 server/test/docker/templates/fedora-32.Dockerfile.in      | 3 ---
 server/test/docker/templates/fedora-33.Dockerfile.in      | 3 ---
 server/test/docker/templates/fedora-34.Dockerfile.in      | 2 +-
 server/test/docker/templates/fedora-35.Dockerfile.in      | 2 +-
 server/test/docker/templates/fedora-36.Dockerfile.in      | 3 +++
 server/test/docker/templates/gentoo.Dockerfile.in         | 5 -----
 server/test/docker/templates/gentoo.Dockerfile.in.FAILING | 6 ++++++
 server/test/docker/templates/ubuntu-14.Dockerfile.in      | 3 ---
 server/test/docker/templates/ubuntu-16.Dockerfile.in      | 3 ---
 server/test/docker/templates/ubuntu-18.Dockerfile.in      | 4 +++-
 server/test/docker/templates/ubuntu-20.10.Dockerfile.in   | 3 ---
 server/test/docker/templates/ubuntu-20.Dockerfile.in      | 4 +++-
 server/test/docker/templates/ubuntu-21.Dockerfile.in      | 3 ---
 server/test/docker/templates/ubuntu-22.Dockerfile.in      | 5 +++++
 23 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/server/autobuild b/server/autobuild
index d05790095d..19dff59e12 100755
--- a/server/autobuild
+++ b/server/autobuild
@@ -401,6 +401,7 @@ os_gentoo() {
               sys-devel/automake
               sys-devel/gcc
               sys-devel/make
+              sys-libs/glibc
               sys-libs/zlib"
     return 0
 }
diff --git a/server/test/docker/templates/arch.Dockerfile.in 
b/server/test/docker/templates/arch.Dockerfile.in
deleted file mode 100644
index e22722386b..0000000000
--- a/server/test/docker/templates/arch.Dockerfile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- dockerfile -*-
-FROM archlinux:latest
-RUN pacman -Syu --noconfirm --noprogressbar && \
-    pacman -S --noconfirm --noprogressbar poppler-glib base-devel
diff --git a/server/test/docker/templates/arch.Dockerfile.in.FAILING 
b/server/test/docker/templates/arch.Dockerfile.in.FAILING
new file mode 100644
index 0000000000..a85762b504
--- /dev/null
+++ b/server/test/docker/templates/arch.Dockerfile.in.FAILING
@@ -0,0 +1,4 @@
+# -*- dockerfile -*-
+FROM archlinux:latest
+RUN pacman -Syu --noconfirm --noprogressbar
+# @TODO: The official Archlinux image does not seem to have any form of shell. 
Marking this as FAILING.
diff --git a/server/test/docker/templates/centos-7.Dockerfile.in 
b/server/test/docker/templates/centos-7.Dockerfile.in
deleted file mode 100644
index cdebbef228..0000000000
--- a/server/test/docker/templates/centos-7.Dockerfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- dockerfile -*-
-FROM centos:7
-RUN yum update -y && yum install -y gcc poppler-glib-devel
diff --git a/server/test/docker/templates/centos.Dockerfile.in.FAILING 
b/server/test/docker/templates/centos.Dockerfile.in.FAILING
new file mode 100644
index 0000000000..1da2ab83d7
--- /dev/null
+++ b/server/test/docker/templates/centos.Dockerfile.in.FAILING
@@ -0,0 +1,6 @@
+# -*- dockerfile -*-
+FROM centos:centos7
+RUN sed -i -e "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-*
+RUN sed -i -e 
"s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" 
/etc/yum.repos.d/CentOS-*
+RUN yum update -y
+# @TODO: Since CentOS is no more, do I even want to try and fix this?
diff --git a/server/test/docker/templates/debian-10.Dockerfile.in 
b/server/test/docker/templates/debian-10.Dockerfile.in
index 139db32879..2f01de7e74 100644
--- a/server/test/docker/templates/debian-10.Dockerfile.in
+++ b/server/test/docker/templates/debian-10.Dockerfile.in
@@ -1,3 +1,4 @@
 # -*- dockerfile -*-
+# Debian 10 is known as buster
 FROM debian:10
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
+RUN apt-get update -y
diff --git a/server/test/docker/templates/debian-11.Dockerfile.in 
b/server/test/docker/templates/debian-11.Dockerfile.in
new file mode 100644
index 0000000000..cabb29d98e
--- /dev/null
+++ b/server/test/docker/templates/debian-11.Dockerfile.in
@@ -0,0 +1,4 @@
+# -*- dockerfile -*-
+# Debian 11 is known as bullseye
+FROM debian:11
+RUN apt-get update -y
diff --git a/server/test/docker/templates/debian-8.Dockerfile.in 
b/server/test/docker/templates/debian-8.Dockerfile.in
deleted file mode 100644
index e7c7a15ddd..0000000000
--- a/server/test/docker/templates/debian-8.Dockerfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- dockerfile -*-
-FROM debian:8
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
diff --git a/server/test/docker/templates/debian-9.Dockerfile.in 
b/server/test/docker/templates/debian-9.Dockerfile.in
index db166c3296..8f6e34140b 100644
--- a/server/test/docker/templates/debian-9.Dockerfile.in
+++ b/server/test/docker/templates/debian-9.Dockerfile.in
@@ -1,3 +1,4 @@
 # -*- dockerfile -*-
+# Debian 9 is known as stretch
 FROM debian:9
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
+RUN apt-get update -y
diff --git a/server/test/docker/templates/fedora-32.Dockerfile.in 
b/server/test/docker/templates/fedora-32.Dockerfile.in
deleted file mode 100644
index 1ee8a68ee2..0000000000
--- a/server/test/docker/templates/fedora-32.Dockerfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- dockerfile -*-
-FROM fedora:32
-RUN dnf update -y && dnf install -y gcc poppler-glib-devel
diff --git a/server/test/docker/templates/fedora-33.Dockerfile.in 
b/server/test/docker/templates/fedora-33.Dockerfile.in
deleted file mode 100644
index 13b0ae0e90..0000000000
--- a/server/test/docker/templates/fedora-33.Dockerfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- dockerfile -*-
-FROM fedora:33
-RUN dnf update -y && dnf install -y gcc poppler-glib-devel
diff --git a/server/test/docker/templates/fedora-34.Dockerfile.in 
b/server/test/docker/templates/fedora-34.Dockerfile.in
index 0a432382d7..42dc26d8bd 100644
--- a/server/test/docker/templates/fedora-34.Dockerfile.in
+++ b/server/test/docker/templates/fedora-34.Dockerfile.in
@@ -1,3 +1,3 @@
 # -*- dockerfile -*-
 FROM fedora:34
-RUN dnf update -y && dnf install -y gcc poppler-glib-devel
+RUN dnf update -y
diff --git a/server/test/docker/templates/fedora-35.Dockerfile.in 
b/server/test/docker/templates/fedora-35.Dockerfile.in
index 1baf0764b5..16a0eb3646 100644
--- a/server/test/docker/templates/fedora-35.Dockerfile.in
+++ b/server/test/docker/templates/fedora-35.Dockerfile.in
@@ -1,3 +1,3 @@
 # -*- dockerfile -*-
 FROM fedora:35
-RUN dnf update -y && dnf install -y gcc poppler-glib-devel
+RUN dnf update -y
diff --git a/server/test/docker/templates/fedora-36.Dockerfile.in 
b/server/test/docker/templates/fedora-36.Dockerfile.in
new file mode 100644
index 0000000000..e795d685bb
--- /dev/null
+++ b/server/test/docker/templates/fedora-36.Dockerfile.in
@@ -0,0 +1,3 @@
+# -*- dockerfile -*-
+FROM fedora:36
+RUN dnf update -y
diff --git a/server/test/docker/templates/gentoo.Dockerfile.in 
b/server/test/docker/templates/gentoo.Dockerfile.in
deleted file mode 100644
index 00ef03f8e9..0000000000
--- a/server/test/docker/templates/gentoo.Dockerfile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- dockerfile -*-
-FROM gentoo/stage3-amd64
-RUN emerge --sync && emerge sys-devel/gcc app-text/poppler
-
-
diff --git a/server/test/docker/templates/gentoo.Dockerfile.in.FAILING 
b/server/test/docker/templates/gentoo.Dockerfile.in.FAILING
new file mode 100644
index 0000000000..7e1d52089a
--- /dev/null
+++ b/server/test/docker/templates/gentoo.Dockerfile.in.FAILING
@@ -0,0 +1,6 @@
+# -*- dockerfile -*-
+FROM gentoo/stage3
+RUN emerge --sync
+# IF you see this error, just ignore it: !!! It seems /run is not mounted. 
Process management may malfunction.
+# Note that gentoo takes a **long** time to build and run, that's okay.
+# @TODO: Currently, running this errors out because it cannot find glib-2.0, 
needs fixing.
diff --git a/server/test/docker/templates/ubuntu-14.Dockerfile.in 
b/server/test/docker/templates/ubuntu-14.Dockerfile.in
deleted file mode 100644
index 5cd2bbe576..0000000000
--- a/server/test/docker/templates/ubuntu-14.Dockerfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- dockerfile -*-
-FROM ubuntu:trusty
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
diff --git a/server/test/docker/templates/ubuntu-16.Dockerfile.in 
b/server/test/docker/templates/ubuntu-16.Dockerfile.in
deleted file mode 100644
index e166f43fbb..0000000000
--- a/server/test/docker/templates/ubuntu-16.Dockerfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- dockerfile -*-
-FROM ubuntu:xenial
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
diff --git a/server/test/docker/templates/ubuntu-18.Dockerfile.in 
b/server/test/docker/templates/ubuntu-18.Dockerfile.in
index 5c04f3dc18..8f4cc6bc36 100644
--- a/server/test/docker/templates/ubuntu-18.Dockerfile.in
+++ b/server/test/docker/templates/ubuntu-18.Dockerfile.in
@@ -1,3 +1,5 @@
 # -*- dockerfile -*-
 FROM ubuntu:bionic
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
+ARG DEBIAN_FRONTEND=noninteractive
+# Need to install tzdata here to avoid stupid prompts when running package 
install via autobuild
+RUN apt-get update -y && apt-get install -y tzdata
diff --git a/server/test/docker/templates/ubuntu-20.10.Dockerfile.in 
b/server/test/docker/templates/ubuntu-20.10.Dockerfile.in
deleted file mode 100644
index ff3294a459..0000000000
--- a/server/test/docker/templates/ubuntu-20.10.Dockerfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- dockerfile -*-
-FROM ubuntu:groovy
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
diff --git a/server/test/docker/templates/ubuntu-20.Dockerfile.in 
b/server/test/docker/templates/ubuntu-20.Dockerfile.in
index a039e5ecbd..515e5f5566 100644
--- a/server/test/docker/templates/ubuntu-20.Dockerfile.in
+++ b/server/test/docker/templates/ubuntu-20.Dockerfile.in
@@ -1,3 +1,5 @@
 # -*- dockerfile -*-
 FROM ubuntu:focal
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
+ARG DEBIAN_FRONTEND=noninteractive
+# Need to install tzdata here to avoid stupid prompts when running package 
install via autobuild
+RUN apt-get update -y && apt-get install -y tzdata
diff --git a/server/test/docker/templates/ubuntu-21.Dockerfile.in 
b/server/test/docker/templates/ubuntu-21.Dockerfile.in
deleted file mode 100644
index 809d7edd9f..0000000000
--- a/server/test/docker/templates/ubuntu-21.Dockerfile.in
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- dockerfile -*-
-FROM ubuntu:hirsute
-RUN apt-get update -y && apt-get install -y gcc libpoppler-glib-dev
diff --git a/server/test/docker/templates/ubuntu-22.Dockerfile.in 
b/server/test/docker/templates/ubuntu-22.Dockerfile.in
new file mode 100644
index 0000000000..649752d846
--- /dev/null
+++ b/server/test/docker/templates/ubuntu-22.Dockerfile.in
@@ -0,0 +1,5 @@
+# -*- dockerfile -*-
+FROM ubuntu:jammy
+ARG DEBIAN_FRONTEND=noninteractive
+# Need to install tzdata here to avoid stupid prompts when running package 
install via autobuild
+RUN apt-get update -y && apt-get install -y tzdata

[Prev in Thread]

Current Thread

[Next in Thread]

[nongnu] elpa/pdf-tools updated (fedd930a09 -> f9ccdf99e5), ELPA Syncer, 2022/05/21
- [nongnu] elpa/pdf-tools 97a2981929 1/4: Remove usage of all private poppler headers in pdf-tools, ELPA Syncer, 2022/05/21
- [nongnu] elpa/pdf-tools a243f410a0 2/4: Update the current Dockerfile templates, ELPA Syncer <=
- [nongnu] elpa/pdf-tools f9ccdf99e5 4/4: Add a Makefile target to clean docker containers, ELPA Syncer, 2022/05/21
- [nongnu] elpa/pdf-tools 4be4df7cf7 3/4: Create named containers when running docker/podman tests, ELPA Syncer, 2022/05/21

Prev by Date: [nongnu] elpa/pdf-tools updated (fedd930a09 -> f9ccdf99e5)
Next by Date: [nongnu] elpa/pdf-tools f9ccdf99e5 4/4: Add a Makefile target to clean docker containers
Previous by thread: [nongnu] elpa/pdf-tools 97a2981929 1/4: Remove usage of all private poppler headers in pdf-tools
Next by thread: [nongnu] elpa/pdf-tools f9ccdf99e5 4/4: Add a Makefile target to clean docker containers
Index(es):
- Date
- Thread