From b0e18e9ca49761bbf014778dfbb276f6559303ba Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Sat, 25 Mar 2023 18:51:41 -0400
Subject: [PATCH] docker: use dep alpine base image
---
.github/workflows/release-package.yml | 2 +-
docker/DockerfileAlpine | 22 +------------------
...kerfileAlpineDeps => DockerfileDepsAlpine} | 0
3 files changed, 2 insertions(+), 22 deletions(-)
rename docker/{DockerfileAlpineDeps => DockerfileDepsAlpine} (100%)
diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml
index f87cc595..5a594786 100644
--- a/.github/workflows/release-package.yml
+++ b/.github/workflows/release-package.yml
@@ -213,7 +213,7 @@ jobs:
uses: docker/build-push-action@v3
with:
context: .
- file: docker/DockerfileAlpineDeps
+ file: docker/DockerfileDepsAlpine
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
diff --git a/docker/DockerfileAlpine b/docker/DockerfileAlpine
index 643a659d..e6f865ed 100644
--- a/docker/DockerfileAlpine
+++ b/docker/DockerfileAlpine
@@ -1,27 +1,7 @@
-FROM alpine:3.17 AS build
+FROM ghcr.io/savoirfairelinux/opendht/opendht-deps-alpine:latest AS build
LABEL maintainer="Adrien Béraud <adrien.beraud@savoirfairelinux.com>"
LABEL org.opencontainers.image.source https://github.com/savoirfairelinux/opendht
-RUN apk add --no-cache \
- build-base cmake ninja git wget \
- cython python3-dev py3-setuptools \
- ncurses-dev readline-dev nettle-dev \
- cppunit-dev gnutls-dev jsoncpp-dev \
- argon2-dev openssl-dev fmt-dev \
- http-parser-dev asio-dev msgpack-cxx-dev \
- && rm -rf /var/cache/apk/*
-
-RUN echo "*** Downloading RESTinio ***" \
- && mkdir restinio && cd restinio \
- && wget https://github.com/aberaud/restinio/archive/bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
- && tar -xzf bbaa034dbcc7555ce67df0f8a1475591a7441733.tar.gz \
- && cd restinio-bbaa034dbcc7555ce67df0f8a1475591a7441733/dev \
- && cmake -DCMAKE_INSTALL_PREFIX=/usr -DRESTINIO_TEST=OFF -DRESTINIO_SAMPLE=OFF \
- -DRESTINIO_INSTALL_SAMPLES=OFF -DRESTINIO_BENCH=OFF -DRESTINIO_INSTALL_BENCHES=OFF \
- -DRESTINIO_FIND_DEPS=ON -DRESTINIO_ALLOW_SOBJECTIZER=Off -DRESTINIO_USE_BOOST_ASIO=none . \
- && make -j8 && make install \
- && cd ../../.. && rm -rf restinio
-
COPY . opendht
RUN mkdir /install
diff --git a/docker/DockerfileAlpineDeps b/docker/DockerfileDepsAlpine
similarity index 100%
rename from docker/DockerfileAlpineDeps
rename to docker/DockerfileDepsAlpine
--
GitLab