diff --git a/Makefile b/Makefile index 05f32a9..00e9694 100644 --- a/Makefile +++ b/Makefile @@ -256,7 +256,8 @@ version: pkg: version ## Create some distribution packages rm -rf builds && mkdir build: - scripts/pkg.sh + docker-compose build + docker-compose run --rm -v $(shell pwd)/:/stns changelog: git-chglog -o CHANGELOG.md diff --git a/dockerfiles/Dockerfile.centos-7 b/dockerfiles/Dockerfile.centos-7 index cc0529f..cc3aed4 100644 --- a/dockerfiles/Dockerfile.centos-7 +++ b/dockerfiles/Dockerfile.centos-7 @@ -1,6 +1,9 @@ FROM centos:7 MAINTAINER pyama86 -RUN yum install -y glibc \ +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && \ + yum -y update && yum clean all && \ + yum install -y glibc \ gcc \ make \ bzip2 \ diff --git a/dockerfiles/Dockerfile.debian-10 b/dockerfiles/Dockerfile.debian-10 deleted file mode 100644 index 7d4718e..0000000 --- a/dockerfiles/Dockerfile.debian-10 +++ /dev/null @@ -1,20 +0,0 @@ -FROM debian:buster -MAINTAINER pyama86 - -RUN ln -sf /usr/share/zoneinfo/Asia/Tokyo /etc/localtime -RUN apt-get -qqy update && \ - apt-get install -qqy glibc-source \ - gcc \ - make \ - bzip2 \ - unzip \ - debhelper \ - dh-make \ - devscripts \ - cdbs \ - clang \ - git - -ENV USER root -RUN mkdir /stns -WORKDIR /stns diff --git a/scripts/pkg.sh b/scripts/pkg.sh deleted file mode 100755 index e80ac6b..0000000 --- a/scripts/pkg.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -pids=() -SUPPORTOS="centos7 almalinux9 ubuntu20 ubuntu22 ubuntu24 debian10 debian11 debian12" -rm -rf builds && mkdir builds -for i in $SUPPORTOS; do - { - docker-compose build nss_$i && docker-compose run --rm -v "$(pwd)":/stns nss_$i - } 2>&1 | tee builds/$i.log & - - pids+=($!) -done - -for pid in ${pids[@]}; do - wait $pid - if [ $? -ne 0 ]; then - exit 1 - fi -done -rm -f builds/*log