From 1d2d7f96cd45ff07f61425ab82dcc2e7be2efdf9 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 20 Oct 2023 23:44:27 +0900 Subject: [PATCH] updated some dockerfiles --- docker-images/Dockerfile.dev-gcc-rocky9 | 4 ++ ...2-fedora38 => Dockerfile.dev-gm2-fedora38} | 0 docker-images/Dockerfile.dev-go-centos7 | 5 +++ docker-images/Dockerfile.go-centos7 | 5 --- docker-images/Dockerfile.go-centos7-big | 4 -- docker-images/Makefile | 40 +++++++++++-------- 6 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 docker-images/Dockerfile.dev-gcc-rocky9 rename docker-images/{Dockerfile.gm2-fedora38 => Dockerfile.dev-gm2-fedora38} (100%) create mode 100644 docker-images/Dockerfile.dev-go-centos7 delete mode 100644 docker-images/Dockerfile.go-centos7 delete mode 100644 docker-images/Dockerfile.go-centos7-big diff --git a/docker-images/Dockerfile.dev-gcc-rocky9 b/docker-images/Dockerfile.dev-gcc-rocky9 new file mode 100644 index 0000000..b3ddfe9 --- /dev/null +++ b/docker-images/Dockerfile.dev-gcc-rocky9 @@ -0,0 +1,4 @@ +## rocky linux 9 image to use for building hawk + +FROM docker.io/rockylinux:9 +RUN ulimit -n 1024 && dnf -y install --enablerepo=devel mysql-devel libffi-devel rpm-build gcc gcc-c++ diff --git a/docker-images/Dockerfile.gm2-fedora38 b/docker-images/Dockerfile.dev-gm2-fedora38 similarity index 100% rename from docker-images/Dockerfile.gm2-fedora38 rename to docker-images/Dockerfile.dev-gm2-fedora38 diff --git a/docker-images/Dockerfile.dev-go-centos7 b/docker-images/Dockerfile.dev-go-centos7 new file mode 100644 index 0000000..fb81d0c --- /dev/null +++ b/docker-images/Dockerfile.dev-go-centos7 @@ -0,0 +1,5 @@ +FROM centos:centos7.9.2009 + + +RUN ulimit -n 1024 && yum -y install wget curl make gcc rpm-build git libcap-devel && cd /opt && wget https://go.dev/dl/go1.20.6.linux-amd64.tar.gz && tar -zxvf go1.20.6.linux-amd64.tar.gz && rm -f go1.20.6.linux-amd64.tar.gz +RUN echo 'PATH=$PATH:/opt/go/bin' > /etc/profile.d/go.sh diff --git a/docker-images/Dockerfile.go-centos7 b/docker-images/Dockerfile.go-centos7 deleted file mode 100644 index 1c53b81..0000000 --- a/docker-images/Dockerfile.go-centos7 +++ /dev/null @@ -1,5 +0,0 @@ -FROM centos:centos7.9.2009 - - -RUN ulimit -n 1024 && yum -y install wget curl make gcc rpm-build git && cd /opt && wget https://go.dev/dl/go1.20.6.linux-amd64.tar.gz && tar -zxvf go1.20.6.linux-amd64.tar.gz && rm -f go1.20.6.linux-amd64.tar.gz -RUN echo 'PATH=$PATH:/opt/go/bin' > /etc/profile.d/go.sh diff --git a/docker-images/Dockerfile.go-centos7-big b/docker-images/Dockerfile.go-centos7-big deleted file mode 100644 index b730db3..0000000 --- a/docker-images/Dockerfile.go-centos7-big +++ /dev/null @@ -1,4 +0,0 @@ -FROM go:centos7 - - -RUN ulimit -n 1024 && yum -y install libpcap-devel diff --git a/docker-images/Makefile b/docker-images/Makefile index f7a6b5a..1c2ca18 100644 --- a/docker-images/Makefile +++ b/docker-images/Makefile @@ -1,26 +1,32 @@ -build: go-centos7 go-centos7-big +build: dev-go-centos7 -publish: publish-go-centos7 publish-go-centos7-big +publish: publish-dev-go-centos7 -go-centos7: - docker build -t go:centos7 -f Dockerfile.$@ . +dev-go-centos7: + docker build -t dev:go1.20.6.centos7 -f Dockerfile.$@ . -publish-go-centos7: - docker tag go:centos7 docker.io/hyunghwan/go:centos7 - docker push docker.io/hyunghwan/go:centos7 +publish-dev-go-centos7: + docker tag dev:go1.20.6.centos7 docker.io/hyunghwan/dev:go1.20.6.centos7 + docker push docker.io/hyunghwan/dev:go1.20.6.centos7 +dev-go-centos7-big: + docker build -t dev:go1.20.6.centos7.big -f Dockerfile.$@ . -go-centos7-big: - docker build -t go:centos7-big -f Dockerfile.$@ . +publish-dev-go-centos7-big: + docker tag dev:go1.20.6.centos7.big docker.io/hyunghwan/dev:go1.20.6.centos7.big + docker push docker.io/hyunghwan/dev:go1.20.6.centos7.big -publish-go-centos7-big: - docker tag go:centos7-big docker.io/hyunghwan/go:centos7-big - docker push docker.io/hyunghwan/go:centos7-big +dev-gm2-fedora38: + docker build -t dev:gm2.fedora38 -f Dockerfile.$@ . -gm2-fedora38: - docker build -t gm2:fedora38 -f Dockerfile.$@ . +publish-dev-gm2-fedora38: + docker tag dev:gm2.fedora38 docker.io/hyunghwan/dev:gm2.fedora38 + docker push docker.io/hyunghwan/dev:gm2.fedora38 -publish-gm2-fedora38: - docker tag gm2:fedora38 docker.io/hyunghwan/gm2:fedora38 - docker push docker.io/hyunghwan/gm2:fedora38 +dev-gcc-rocky9: + docker build -t dev:gcc.rocky9 -f Dockerfile.$@ . + +publish-dev-gcc-rocky9: + docker tag dev:gcc.rocky9 docker.io/hyunghwan/dev:gcc.rocky9 + docker push docker.io/hyunghwan/dev:gcc.rocky9