From bc0305cca999665f9b36d10fb8d010178f54f6dc Mon Sep 17 00:00:00 2001 From: gaohechao <1159963696@qq.com> Date: Mon, 11 Oct 2021 14:55:15 +0800 Subject: [PATCH 1/5] openeuler nginx1.20.1 base image --- nginx/20.03/1.20.1/Dockerfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 nginx/20.03/1.20.1/Dockerfile diff --git a/nginx/20.03/1.20.1/Dockerfile b/nginx/20.03/1.20.1/Dockerfile new file mode 100644 index 0000000..f8c3b31 --- /dev/null +++ b/nginx/20.03/1.20.1/Dockerfile @@ -0,0 +1,17 @@ +FROM openeuler/openeuler:20.03-lts-sp1 +MAINTAINER gaohechao +USER root +RUN dnf -y update \ + && dnf -y install wget\ + && dnf -y install git\ + && dnf -y install tar make gcc zlib zlib-devel pcre-devel openssl openssl-devel gcc-c++ pcre-devel\ + && rm -rf /var/lib/{apt,dpkg,cache,log}/ +RUN wget http://nginx.org/download/nginx-1.20.1.tar.gz \ + && tar -xvf nginx-1.20.1.tar.gz && rm nginx-1.20.1.tar.gz +RUN cd nginx-1.20.1 \ + && ./configure --prefix=/etc/nginx/ --with-http_ssl_module --with-http_realip_module \ + && make && make install \ + && cd ../ && rm -rf nginx-1.20.1 \ + && mkdir -p /var/log/nginx +ENV PATH="/etc/nginx/sbin:${PATH}" +ENTRYPOINT ["nginx", "-g", "daemon off;"] -- Gitee From 7a900ed8b6f310f2546669ca643c32926e3a9bc6 Mon Sep 17 00:00:00 2001 From: gaohechao <1159963696@qq.com> Date: Tue, 12 Oct 2021 11:44:36 +0800 Subject: [PATCH 2/5] Use openEuler nginx --- nginx/1.16.1/20.03-lts-sp1/Dockerfile | 6 ++++++ nginx/20.03/1.20.1/Dockerfile | 17 ----------------- nginx/README.md | 5 +++++ 3 files changed, 11 insertions(+), 17 deletions(-) create mode 100644 nginx/1.16.1/20.03-lts-sp1/Dockerfile delete mode 100644 nginx/20.03/1.20.1/Dockerfile create mode 100644 nginx/README.md diff --git a/nginx/1.16.1/20.03-lts-sp1/Dockerfile b/nginx/1.16.1/20.03-lts-sp1/Dockerfile new file mode 100644 index 0000000..0776d3a --- /dev/null +++ b/nginx/1.16.1/20.03-lts-sp1/Dockerfile @@ -0,0 +1,6 @@ +FROM openeuler/openeuler:20.03-lts-sp1 +MAINTAINER gaohechao +USER root +RUN dnf -y update \ + && dnf -y install nginx +ENTRYPOINT ["nginx", "-g", "daemon off;"] diff --git a/nginx/20.03/1.20.1/Dockerfile b/nginx/20.03/1.20.1/Dockerfile deleted file mode 100644 index f8c3b31..0000000 --- a/nginx/20.03/1.20.1/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM openeuler/openeuler:20.03-lts-sp1 -MAINTAINER gaohechao -USER root -RUN dnf -y update \ - && dnf -y install wget\ - && dnf -y install git\ - && dnf -y install tar make gcc zlib zlib-devel pcre-devel openssl openssl-devel gcc-c++ pcre-devel\ - && rm -rf /var/lib/{apt,dpkg,cache,log}/ -RUN wget http://nginx.org/download/nginx-1.20.1.tar.gz \ - && tar -xvf nginx-1.20.1.tar.gz && rm nginx-1.20.1.tar.gz -RUN cd nginx-1.20.1 \ - && ./configure --prefix=/etc/nginx/ --with-http_ssl_module --with-http_realip_module \ - && make && make install \ - && cd ../ && rm -rf nginx-1.20.1 \ - && mkdir -p /var/log/nginx -ENV PATH="/etc/nginx/sbin:${PATH}" -ENTRYPOINT ["nginx", "-g", "daemon off;"] diff --git a/nginx/README.md b/nginx/README.md new file mode 100644 index 0000000..0343655 --- /dev/null +++ b/nginx/README.md @@ -0,0 +1,5 @@ +# nginx + +### 1.16.1-20.03-lts-sp1 +- openEuler社区官方发布的nginx镜像Dockerfile, +- 基础镜像版本为openEuler:20.03-lts-sp1,应用镜像版本为nginx:1.16.1。 -- Gitee From 2e0c03bb63e674fc8218b941abef5643eda5b9d4 Mon Sep 17 00:00:00 2001 From: gaohechao <1159963696@qq.com> Date: Tue, 12 Oct 2021 15:39:31 +0800 Subject: [PATCH 3/5] Reduce image size --- nginx/1.16.1/20.03-lts-sp1/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx/1.16.1/20.03-lts-sp1/Dockerfile b/nginx/1.16.1/20.03-lts-sp1/Dockerfile index 0776d3a..32da610 100644 --- a/nginx/1.16.1/20.03-lts-sp1/Dockerfile +++ b/nginx/1.16.1/20.03-lts-sp1/Dockerfile @@ -1,6 +1,6 @@ FROM openeuler/openeuler:20.03-lts-sp1 MAINTAINER gaohechao -USER root RUN dnf -y update \ - && dnf -y install nginx + && dnf -y install nginx \ + && dnf clean all ENTRYPOINT ["nginx", "-g", "daemon off;"] -- Gitee From 8758d288e463ab461a10594bb2f86441eb5df176 Mon Sep 17 00:00:00 2001 From: gaohechao <1159963696@qq.com> Date: Tue, 12 Oct 2021 15:45:22 +0800 Subject: [PATCH 4/5] Add nginx README file --- nginx/1.16.1/20.03-lts-sp1/README.md | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 nginx/1.16.1/20.03-lts-sp1/README.md diff --git a/nginx/1.16.1/20.03-lts-sp1/README.md b/nginx/1.16.1/20.03-lts-sp1/README.md new file mode 100644 index 0000000..8ef31ed --- /dev/null +++ b/nginx/1.16.1/20.03-lts-sp1/README.md @@ -0,0 +1,30 @@ +# Nginx + +# Quick reference + +- The official Nginx docker image. + +- Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative) + +- Where to get help: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative), [openEuler](https://gitee.com/openeuler/community) + +# Build reference + +1. Build images and push: +```shell +docker buildx build -t "openeuler/nginx:$VERSION" --platform linux/amd64,linux/arm64 . --push +``` + +We are using `buildx` in here to generate multi-arch images, see more in [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) + +2. Run: +```shell +docker run docker run -ti openeuler/nginx:1.16.1-20.03-lts-sp1 +``` + +# Supported tags and respective Dockerfile links + +- 1.16.1-20.03-lts-sp1: nginx v1.16.1, openEuler 20.03 LTS SP1 + +## Operating System +Linux/Unix, ARM64 or x86-64 architecture. -- Gitee From 5cc0da579bb5c4ace3f4024d23c654ae73504a7f Mon Sep 17 00:00:00 2001 From: gaohechao <1159963696@qq.com> Date: Tue, 12 Oct 2021 16:43:30 +0800 Subject: [PATCH 5/5] Add Nginx on openEuler 20.03 LTS SP1 --- nginx/1.16.1/20.03-lts-sp1/README.md | 30 ------------------------- nginx/README.md | 33 ++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 34 deletions(-) delete mode 100644 nginx/1.16.1/20.03-lts-sp1/README.md diff --git a/nginx/1.16.1/20.03-lts-sp1/README.md b/nginx/1.16.1/20.03-lts-sp1/README.md deleted file mode 100644 index 8ef31ed..0000000 --- a/nginx/1.16.1/20.03-lts-sp1/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Nginx - -# Quick reference - -- The official Nginx docker image. - -- Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative) - -- Where to get help: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative), [openEuler](https://gitee.com/openeuler/community) - -# Build reference - -1. Build images and push: -```shell -docker buildx build -t "openeuler/nginx:$VERSION" --platform linux/amd64,linux/arm64 . --push -``` - -We are using `buildx` in here to generate multi-arch images, see more in [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) - -2. Run: -```shell -docker run docker run -ti openeuler/nginx:1.16.1-20.03-lts-sp1 -``` - -# Supported tags and respective Dockerfile links - -- 1.16.1-20.03-lts-sp1: nginx v1.16.1, openEuler 20.03 LTS SP1 - -## Operating System -Linux/Unix, ARM64 or x86-64 architecture. diff --git a/nginx/README.md b/nginx/README.md index 0343655..8ef31ed 100644 --- a/nginx/README.md +++ b/nginx/README.md @@ -1,5 +1,30 @@ -# nginx +# Nginx -### 1.16.1-20.03-lts-sp1 -- openEuler社区官方发布的nginx镜像Dockerfile, -- 基础镜像版本为openEuler:20.03-lts-sp1,应用镜像版本为nginx:1.16.1。 +# Quick reference + +- The official Nginx docker image. + +- Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative) + +- Where to get help: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative), [openEuler](https://gitee.com/openeuler/community) + +# Build reference + +1. Build images and push: +```shell +docker buildx build -t "openeuler/nginx:$VERSION" --platform linux/amd64,linux/arm64 . --push +``` + +We are using `buildx` in here to generate multi-arch images, see more in [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) + +2. Run: +```shell +docker run docker run -ti openeuler/nginx:1.16.1-20.03-lts-sp1 +``` + +# Supported tags and respective Dockerfile links + +- 1.16.1-20.03-lts-sp1: nginx v1.16.1, openEuler 20.03 LTS SP1 + +## Operating System +Linux/Unix, ARM64 or x86-64 architecture. -- Gitee