diff --git a/httpd/README.md b/httpd/README.md index 470580e09c803bdaeb8ae3379932e1388acdbd79..0ec816a296054fa6896f05e5af5135c5e25acffc 100644 --- a/httpd/README.md +++ b/httpd/README.md @@ -27,6 +27,7 @@ docker run --name my-httpd -d -p 80:80 openeuler/httpd:{TAG} # Supported tags and respective Dockerfile links - httpd2.4.51-oe2203lts: httpd v2.4.51, openEuler 22.03 LTS +- 2.4.58-oe2203sp3: httpd v2.4.58, openEuler 22.03 LTS SP3 ## Operating System Linux/Unix, ARM64 or x86-64 architecture. diff --git a/httpd/meta.yml b/httpd/meta.yml index c124a5b9b4867c0b10ba71e26f49c34fb7fdd3b4..f3f25c5b69b52d549d60f2815d1416730e4e9227 100644 --- a/httpd/meta.yml +++ b/httpd/meta.yml @@ -1,2 +1,4 @@ -- httpd2.4.51-oe2203lts - 2.4.51/22.03-lts/Dockerfile \ No newline at end of file +httpd2.4.51-oe2203lts: + - 2.4.51/22.03-lts/Dockerfile +2.4.58-oe2203sp3: + - 2.4.58/22.03-lts-sp3/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/prometheus-pushgateway/README.md b/prometheus-pushgateway/README.md new file mode 100644 index 0000000000000000000000000000000000000000..537c57569f21f5802f3b5eb8002b0e162a05fc38 --- /dev/null +++ b/prometheus-pushgateway/README.md @@ -0,0 +1,30 @@ +# Prometheus-pushgateway + +# Quick reference + +- The official prometheus-pushgateway 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/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/) + +2. Run: +```shell +docker run -d -p 9091:9091 openeuler/prometheus-pushgateway:$TAG +``` + +# Supported tags and respective Dockerfile links + +- 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/prometheus-pushgateway/doc/image-info.yml b/prometheus-pushgateway/doc/image-info.yml new file mode 100644 index 0000000000000000000000000000000000000000..92d1273c74620d172d36a85758ab57edeecb6c47 --- /dev/null +++ b/prometheus-pushgateway/doc/image-info.yml @@ -0,0 +1,85 @@ +name: prometheus-pushgateway +category: cloud +description: Prometheus Pushgateway的存在是为了允许临时作业和批处理作业将其指标公开给Prometheus。由于此类工作可能存在的时间不够长而无法被删除，因此他们可以将其指标推送到Pushgateway。然后Pushgateway将这些指标公开给Prometheus。 +environment: | + 本应用以容器镜像的方式供用户使用，运行于预置docker的Linux环境。Docker的推荐安装方式如下： + ## apt安装 + ### 1.更新系统软件包依赖 + ``` + sudo spt update + sudo apt install ca-certificates curl gnupg lsb-release + ``` + ### 2.添加Docker官方GPG密钥 + ``` + sudo mkdir -p /etc/apt/keyrings + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg + sudo chmod a+r /etc/apt/keyrings/docker.gpg + ``` + ### 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 + ``` + ### 4.再次更新软件包索引 + ``` + sudo apt update + ``` + ### 5.安装Docker + ``` + sudo apt install docker-ce docker-ce-cli containerd.io + ``` + + ## yum安装 + ### 1.安装yum-utils + ``` + sudo yum install -y yum-utils + ``` + ### 2.添加Docker源 + ``` + sudo yum-config-manager \ + > --add-repo \ + > https://download.docker.com/linux/centos/docker-ce.repo + ``` + ### 3.安装Docker + ``` + sudo yum install -y docker-ce docker-ce-cli containerd.io + ``` + + 注意，在openEuler环境安装docker时，可执行如下命令一键安装 + ``` + yum install -y docker + ``` + + ## 脚本安装 + ### 1.下载安装脚本 + ``` + curl -fsSL https://get.docker.com -o get-docker.sh + ``` + ### 2.使用root权限执行脚本 + ``` + sudo sh get-docker.sh + ``` + 使用脚本安装方式时，如果用户要指定安装的docker版本，需要自行修改`get-docker.sh`的源码内容。 + + ## 验证 + ``` + sudo docker run hello-world + ``` + +download: | + 获取容器镜像 + ``` + docker pull openeuler/prometheus-pushgateway:{TAG} + ``` + +install: | + 启动容器 + ``` + docker run --name prometheus-pushgateway -p 9091:9091 openeuler/prometheus-pushgateway:{TAG} + ``` + 用户可根据自身需求，自定义启动选项。 + +license: Apache-2.0 license +similar_packages: + - N/A +dependency: + - 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..b87c5861529263daf1bd95e32edb852f9df2ed58 --- /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