apps/openlan
1
0
Fork 0
mirror of https://github.com/luscis/openlan.git synced 2025-12-24 11:10:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: build docker option include rhel

Browse Source
This commit is contained in:
Daniel Ding
2024-04-02 18:55:14 +08:00
parent 93122fc279
commit f736779fba
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -62,8 +62,8 @@ config:
builder:
docker run -d -it \
--env http_proxy="${http_proxy}" --env https_proxy="${https_proxy}"
-v $(SD)/:/opt/openlan -v $(shell echo ~)/.ssh:/root/.ssh \
--env http_proxy="${http_proxy}" --env https_proxy="${https_proxy}" \
--volume $(SD)/:/opt/openlan --volume $(shell echo ~)/.ssh:/root/.ssh \
--name openlan_builder debian:buster bash
docker exec openlan_builder bash -c "apt update && apt install -y git lsb-release wget make gcc"
docker exec openlan_builder bash -c "wget https://golang.google.cn/dl/go1.16.linux-amd64.tar.gz && tar -xf go1.16.linux-amd64.tar.gz -C /usr/local"
@@ -78,17 +78,17 @@ docker-rhel: ## build image for redhat
cp -rf $(SD)/docker/centos $(BD)
cd $(BD) && \
sudo docker build -t luscis/openlan:$(VER).$(ARCH).el \
--build-arg BIN=$(LIN_DIR).bin --build-arg http_proxy="${http_proxy}" --build-arg https_proxy="${https_proxy}" \
-f centos/Dockerfile .
--build-arg linux_bin=$(LIN_DIR).bin --build-arg http_proxy="${http_proxy}" --build-arg https_proxy="${https_proxy}" \
--file centos/Dockerfile .
docker-deb: docker-bin ## build image for debian
cp -rf $(SD)/docker/debian $(BD)
cd $(BD) && \
sudo docker build -t luscis/openlan:$(VER).$(ARCH).deb \
--build-arg BIN=$(LIN_DIR).bin --build-arg http_proxy="${http_proxy}" --build-arg https_proxy="${https_proxy}" \
--build-arg BIN=$(LIN_DIR).bin -f debian/Dockerfile .
--build-arg linux_bin=$(LIN_DIR).bin --build-arg http_proxy="${http_proxy}" --build-arg https_proxy="${https_proxy}" \
--file debian/Dockerfile .
docker: docker-deb ## build docker images
docker: docker-deb docker-rhel ## build docker images
docker-builder: builder ## create a builder

5
docker/centos/Dockerfile
View File

@@ -1,6 +1,6 @@
FROM centos:7
ARG BIN
ARG linux_bin
WORKDIR /root
@@ -9,7 +9,8 @@ RUN yum update -y && \
yum install -y rdma-core libibverbs
ADD ${BIN} /tmp
RUN DOCKER=yes /tmp/${BIN}
RUN DOCKER=yes /tmp/${linux_bin}
RUN rm -rvf /tmp/* && yum clean dbcache
LABEL application="OpenLAN Network Solutions"
LABEL maintainer="danieldin95@163.com"

4
docker/debian/Dockerfile
View File

@@ -1,6 +1,6 @@
FROM debian:buster
ARG BIN
ARG linux_bin
WORKDIR /root
@@ -8,7 +8,7 @@ WORKDIR /root
RUN apt-get update -y
ADD ${BIN} /tmp
RUN DOCKER=yes /tmp/${BIN}
RUN DOCKER=yes /tmp/${linux_bin}
LABEL application="OpenLAN Network Solutions"
LABEL maintainer="danieldin95@163.com"