diff --git a/httpd/meta.yml b/httpd/meta.yml deleted file mode 100644 index 66b5aedc83a8c4432581f021423cc9f3f7d5c54a..0000000000000000000000000000000000000000 --- a/httpd/meta.yml +++ /dev/null @@ -1,2 +0,0 @@ -httpd2.4.51-oe2203lts: - - 2.4.51/22.03-lts/Dockerfile diff --git a/prometheus-pushgateway/1.7.0/22.03-lts-sp3/Dockerfile b/prometheus-pushgateway/1.7.0/22.03-lts-sp3/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..d063ab70db2aedd45541bd0125d9ea27315d1aba --- /dev/null +++ b/prometheus-pushgateway/1.7.0/22.03-lts-sp3/Dockerfile @@ -0,0 +1,20 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp3 +FROM ${BASE} + +ARG TARGETARCH +ARG VERSION=1.7.0 + +RUN yum update -y && yum install -y wget && yum clean all && \ + wget -O pushgateway.tar.gz https://github.com/prometheus/pushgateway/releases/download/v${VERSION}/pushgateway-${VERSION}.linux-${TARGETARCH}.tar.gz && \ + mkdir /pushgateway && tar -zxvf pushgateway.tar.gz -C /pushgateway --strip-components 1 && \ + mv /pushgateway/pushgateway /bin/pushgateway && \ + rm -rf pushgateway.tar.gz /pushgateway/ + +RUN mkdir -p /pushgateway && \ + groupadd -r pushgateway && useradd -r -g pushgateway pushgateway && \ + chown pushgateway:pushgateway /pushgateway /bin/pushgateway + +WORKDIR /pushgateway +USER pushgateway +EXPOSE 9091 +ENTRYPOINT [ "/bin/pushgateway" ] diff --git a/httpd/README.md b/prometheus-pushgateway/README.md similarity index 60% rename from httpd/README.md rename to prometheus-pushgateway/README.md index 470580e09c803bdaeb8ae3379932e1388acdbd79..537c57569f21f5802f3b5eb8002b0e162a05fc38 100644 --- a/httpd/README.md +++ b/prometheus-pushgateway/README.md @@ -1,9 +1,8 @@ -# httpd - +# Prometheus-pushgateway # Quick reference -- The official redis docker image. +- The official prometheus-pushgateway docker image. - Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative) @@ -11,22 +10,21 @@ # Build reference -Build images and push: +1. Build images and push: ```shell -docker buildx build -t "openeuler/httpd:{TAG}" --platform linux/amd64,linux/arm64 . --push +docker buildx build -t "openeuler/prometheus-pushgateway:$TAG" --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/) -# How to use this image -## start a httpd instance +2. Run: ```shell -docker run --name my-httpd -d -p 80:80 openeuler/httpd:{TAG} +docker run -d -p 9091:9091 openeuler/prometheus-pushgateway:$TAG ``` # Supported tags and respective Dockerfile links -- httpd2.4.51-oe2203lts: httpd v2.4.51, openEuler 22.03 LTS +- 1.7.0-oe2203sp3: prometheus-pushgateway v1.7.0, openEuler 22.03-LTS-SP3 ## Operating System Linux/Unix, ARM64 or x86-64 architecture. diff --git a/httpd/doc/image-info.yml b/prometheus-pushgateway/doc/image-info.yml similarity index 59% rename from httpd/doc/image-info.yml rename to prometheus-pushgateway/doc/image-info.yml index 8d7d1419374f3915b683f01c0f7b898900a69fa3..92d1273c74620d172d36a85758ab57edeecb6c47 100644 --- a/httpd/doc/image-info.yml +++ b/prometheus-pushgateway/doc/image-info.yml @@ -1,6 +1,7 @@ -name: httpd -description: The Apache HTTP Server (httpd) is a powerful and flexible HTTP/1.1 compliant web server. -environment: " +name: prometheus-pushgateway +category: cloud +description: Prometheus Pushgateway的存在是为了允许临时作业和批处理作业将其指标公开给Prometheus。由于此类工作可能存在的时间不够长而无法被删除,因此他们可以将其指标推送到Pushgateway。然后Pushgateway将这些指标公开给Prometheus。 +environment: | 本应用以容器镜像的方式供用户使用,运行于预置docker的Linux环境。Docker的推荐安装方式如下: ## apt安装 ### 1.更新系统软件包依赖 @@ -16,7 +17,7 @@ environment: " ``` ### 3.添加Docker官方APT源 ``` - echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable\" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ``` ### 4.再次更新软件包索引 ``` @@ -63,29 +64,22 @@ environment: " ``` sudo docker run hello-world ``` - " -download: " + +download: | 获取容器镜像 ``` - docker pull openeuler/httpd:httpd2.4.51-oe2203lts + docker pull openeuler/prometheus-pushgateway:{TAG} ``` - " -install: " + +install: | 启动容器 ``` - docker run --name my-httpd -d -p 80:80 openeuler/httpd:httpd2.4.51-oe2203lts + docker run --name prometheus-pushgateway -p 9091:9091 openeuler/prometheus-pushgateway:{TAG} ``` - 用户可根据自身需求,自定义启动选项。 - " + 用户可根据自身需求,自定义启动选项。 + license: Apache-2.0 license similar_packages: - - Nginx: 一个高性能的HTTP和反向代理服务器,特点是占用资源少、处理请求速度快,适用于高并发的Web应用。 - - Lighttpd: 一个轻量级的Web服务器软件,特点是占用资源少、处理静态文件速度快,适用于高并发的静态网站。 - - Apache Tomcat: 一个开源的Java Web服务器软件,它是Apache的一个子项目。主要用于部署和运行Java Servlet和JSP(JavaServer Pages)应用程序。 + - N/A dependency: - - systemd-units - - apr - - apr-util - - mailcap - - mariadb-connector-c - - mod_http2 + - N/A \ No newline at end of file diff --git a/prometheus-pushgateway/doc/picture/logo.png b/prometheus-pushgateway/doc/picture/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d7d46b82b79a7ac49f8e5a404db2fa26ee8fd6ab Binary files /dev/null and b/prometheus-pushgateway/doc/picture/logo.png differ diff --git a/prometheus-pushgateway/meta.yml b/prometheus-pushgateway/meta.yml new file mode 100644 index 0000000000000000000000000000000000000000..3a4d8b1f9b2e5775c7abbe51c4761ad690c821e9 --- /dev/null +++ b/prometheus-pushgateway/meta.yml @@ -0,0 +1,2 @@ +1.7.0-oe2203sp3: + - prometheus-pushgateway/1.7.0/22.03-lts-sp3/Dockerfile \ No newline at end of file