diff --git a/docker/Dockerfile b/docker/Dockerfile index bf2ee566f64adf0df825f279568e58a61e13e35c..199d70d8e5d6c878bc60a3dc3dac6324cc05dae6 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 53c72e35b2b7ad4281329e41e01bc37e732bcb60..60dfe9316aa9edc1380ba644d07977282db4ad24 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 15f81e818ca585945476f5272c5e81849b22fcc3..13f9091f7151c6fdd59931a744de319fa8e67df1 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 ed1808f7d073f77abef86d560076d4971cd0bee3..a83fd84d24501536e6014d013c893a68f3002ba7 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 24e28f908f758bb9e52553230599a0e0610881a1..308a7a049b8befb7bfb1823b0a4de4c97d756203 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 7dd33f34c06ddcaa4ff9446e7e509dd39ab5b460..c300e5c57c976b19fbeb6f5434454cecd36152a6 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 669cd37345f674018ee8a39b3670427836a82392..0000000000000000000000000000000000000000 --- 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 50fee7657b71fd9ce4b1416ffb427501c969b330..0000000000000000000000000000000000000000 --- 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 652ede65cdeedb00d0781e27abfc849be6a4602c..0000000000000000000000000000000000000000 --- 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