From 0c4cec66ff09d0c564ca390a601701164a95368e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 23 Mar 2022 12:04:26 -0400
Subject: [PATCH] update Dockerfiles, remove Travis
---
docker/Dockerfile | 3 ++-
docker/DockerfileBionic | 3 ++-
docker/DockerfileDeps | 1 +
docker/DockerfileDepsBionic | 1 +
docker/DockerfileDepsLlvm | 1 +
docker/DockerfileLlvm | 3 ++-
docker/DockerfileTravis | 9 ---------
docker/DockerfileTravisLlvm | 7 -------
docker/DockerfileTravisProxy | 4 ----
9 files changed, 9 insertions(+), 23 deletions(-)
delete mode 100644 docker/DockerfileTravis
delete mode 100644 docker/DockerfileTravisLlvm
delete mode 100644 docker/DockerfileTravisProxy
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bf2ee566..199d70d8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,6 @@
-FROM aberaud/opendht-deps
+FROM ghcr.io/savoirfairelinux/opendht/opendht-deps:latest
LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
RUN git clone https://github.com/savoirfairelinux/opendht.git \
&& cd opendht && mkdir build && cd build \
diff --git a/docker/DockerfileBionic b/docker/DockerfileBionic
index 53c72e35..60dfe931 100644
--- a/docker/DockerfileBionic
+++ b/docker/DockerfileBionic
@@ -1,5 +1,6 @@
-FROM docker.pkg.github.com/savoirfairelinux/opendht/opendht-deps-bionic:latest
+FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-bionic:latest
LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
RUN git clone https://github.com/savoirfairelinux/opendht.git \
&& cd opendht && mkdir build && cd build \
diff --git a/docker/DockerfileDeps b/docker/DockerfileDeps
index 15f81e81..13f9091f 100644
--- a/docker/DockerfileDeps
+++ b/docker/DockerfileDeps
@@ -1,5 +1,6 @@
FROM ubuntu:20.04
LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
RUN apt-get update && apt-get install -y \
dialog apt-utils \
diff --git a/docker/DockerfileDepsBionic b/docker/DockerfileDepsBionic
index ed1808f7..a83fd84d 100644
--- a/docker/DockerfileDepsBionic
+++ b/docker/DockerfileDepsBionic
@@ -1,5 +1,6 @@
FROM ubuntu:18.04
LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
RUN echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
RUN apt-get update && apt-get install -y \
diff --git a/docker/DockerfileDepsLlvm b/docker/DockerfileDepsLlvm
index 24e28f90..308a7a04 100644
--- a/docker/DockerfileDepsLlvm
+++ b/docker/DockerfileDepsLlvm
@@ -1,5 +1,6 @@
FROM ubuntu:20.04
LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
RUN apt-get update && apt-get install -y \
dialog apt-utils \
diff --git a/docker/DockerfileLlvm b/docker/DockerfileLlvm
index 7dd33f34..c300e5c5 100644
--- a/docker/DockerfileLlvm
+++ b/docker/DockerfileLlvm
@@ -1,5 +1,6 @@
-FROM aberaud/opendht-deps-llvm
+FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-llvm:latest
LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
+LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
RUN git clone https://github.com/savoirfairelinux/opendht.git \
&& cd opendht && mkdir build && cd build \
diff --git a/docker/DockerfileTravis b/docker/DockerfileTravis
deleted file mode 100644
index 669cd373..00000000
--- a/docker/DockerfileTravis
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM aberaud/opendht-deps-bionic
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-
-RUN apt-get update && apt-get install -y python3-pip && pip3 install --upgrade cmake
-
-COPY . /root/opendht
-RUN cd /root/opendht && mkdir build && cd build \
- && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_C=On -DOPENDHT_LTO=On -DOPENDHT_TESTS=ON .. \
- && make -j8 && ./opendht_unit_tests && make install
diff --git a/docker/DockerfileTravisLlvm b/docker/DockerfileTravisLlvm
deleted file mode 100644
index 50fee765..00000000
--- a/docker/DockerfileTravisLlvm
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM aberaud/opendht-deps-llvm
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-
-COPY . /root/opendht
-RUN cd /root/opendht && mkdir build && cd build \
- && cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPENDHT_PYTHON=On -DOPENDHT_C=On -DOPENDHT_TESTS=ON .. \
- && make -j8 && ./opendht_unit_tests && make install
diff --git a/docker/DockerfileTravisProxy b/docker/DockerfileTravisProxy
deleted file mode 100644
index 652ede65..00000000
--- a/docker/DockerfileTravisProxy
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM aberaud/opendht-deps
-LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
-
-COPY . /root/opendht
--
GitLab