diff --git a/README.en.md b/README.en.md index 4e4aec144c8af0c84184ee33e0b5dce7eaba327c..6dd67b05bc364a16074e78ffcf4238b9c248a804 100644 --- a/README.en.md +++ b/README.en.md @@ -30,9 +30,11 @@ After the official images are published, we will push to every remote container - [22.09](https://archives.openeuler.openatom.cn/openEuler-22.09/docker_img/) - [22.03-lts-sp1](https://repo.openeuler.org/openEuler-22.03-LTS-SP1/docker_img/) - [22.03-lts-sp2](https://repo.openeuler.org/openEuler-22.03-LTS-SP2/docker_img/) - - [22.03-lts-sp3, 22.03, latest](https://repo.openeuler.org/openEuler-22.03-LTS-SP3/docker_img/) + - [22.03-lts-sp3](https://repo.openeuler.org/openEuler-22.03-LTS-SP3/docker_img/) + - [22.03-lts-sp4, 22.03](https://repo.openeuler.org/openEuler-22.03-LTS-SP4/docker_img/) - [23.03](https://repo.openeuler.org/openEuler-23.03/docker_img/) - [23.09](https://repo.openeuler.org/openEuler-23.09/docker_img/) + - [24.03-lts, latest](https://repo.openeuler.org/openEuler-24.03-LTS/docker_img/) - Path rule:`openeuler/[openEuler version]/Dockerfile`, such as: openEuler 21.09 Dockerfile is under `openeuler/21.09/Dockerfile` path. @@ -76,13 +78,37 @@ The content is as follows: Store application-related images +All openEuler application images contain a `meta.yml` file,which stores the image tag info,the file path is: `[app-name]/meta.yml` + + - `meta.yml` + + The example is as follows: + + # spark/meta.yml + 3.3.1-oe2203lts: + path: spark/3.3.1/22.03-lts/Dockerfile + 3.3.2-oe2203lts: + path: spark/3.3.2/22.03-lts/Dockerfile + + Configuration item description: + | Configuration item | Required or not | Description | Example | + |--|--|--|--| + | path | yes | Relative path of the image dockerfile | spark/3.3.1/22.03-lts/Dockerfile | + | arch | no | This configuration is required when only one architecture is supported. By default, it supports arm64 and amd64 architectures.| x86_64,only x86_64 or aarch64 can be configured. | + #### Available Container Repo -- Hub oepkgs: https://hub.oepkgs.net/ +- [hub.oepkgs.net](https://hub.oepkgs.net/) + +- [hub.docker.com](https://hub.docker.com/) + +- [quay.io](https://quay.io/) -- AtomHub: https://atomhub.openatom.cn/ #### Contributions -Welcome to submit your idea, issue and pull request. +1. After the pull request is merged, the CI process will automatically publish the image. +2. After the `dockerfile` is added or modified, the CI process will automatically publish the image. +3. After the `README.md` is added or modified, the CI process will automatically publish the image README information. +4. Welcome to submit image test cases to the project `eulerPublisher`; The automatic publishing process only checks whether the image can be successfully constructed if the image has no test cases. diff --git a/README.md b/README.md index 2b9b31d1812481e42612c3f0263cab5f5c38c070..52874131765130b278b6859da13043247c12c4c0 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,11 @@ openEuler的基础镜像由社区官方发布,目前发布在[openEuler镜像 - [22.09](https://archives.openeuler.openatom.cn/openEuler-22.09/docker_img/) - [22.03-lts-sp1](https://repo.openeuler.org/openEuler-22.03-LTS-SP1/docker_img/) - [22.03-lts-sp2](https://repo.openeuler.org/openEuler-22.03-LTS-SP2/docker_img/) - - [22.03-lts-sp3, 22.03, latest](https://repo.openeuler.org/openEuler-22.03-LTS-SP3/docker_img/) + - [22.03-lts-sp3](https://repo.openeuler.org/openEuler-22.03-LTS-SP3/docker_img/) + - [22.03-lts-sp4, 22.03](https://repo.openeuler.org/openEuler-22.03-LTS-SP4/docker_img/) - [23.03](https://repo.openeuler.org/openEuler-23.03/docker_img/) - [23.09](https://repo.openeuler.org/openEuler-23.09/docker_img/) + - [24.03-lts, latest](https://repo.openeuler.org/openEuler-24.03-LTS/docker_img/) - 存放路径规则:`openeuler/[openEuler版本号]/Dockerfile`, 例如:openEuler 21.09的Dockerfile位于`openeuler/21.09/Dockerfile`。 @@ -73,16 +75,39 @@ openEuler的基础镜像由社区官方发布,目前发布在[openEuler镜像 - `doc/picture/` 存放应用相关的图片 + +每个应用镜像,包含一个meta.yml文件,存放该镜像的版本信息,文件路径为:`[应用名]/meta.yml` + + - `meta.yml` + + 示例如下: + + # spark/meta.yml + 3.3.1-oe2203lts: + path: spark/3.3.1/22.03-lts/Dockerfile + 3.3.2-oe2203lts: + path: spark/3.3.2/22.03-lts/Dockerfile + arch: aarch64 + + 配置项说明: + | 配置项 | 是否必填 | 配置说明 | 配置示例 | + |--|--|--|--| + | path | 是 | dockerfile相对路径 | spark/3.3.1/22.03-lts/Dockerfile | + | arch | 否 | 用于发布单架构镜像时指定镜像架构;无该字段时,默认发布x86_64和aarch64的双架构镜像。| x86_64,配置仅支持x86_64或aarch64 | #### 国内镜像仓 目前支持的第三方国内镜像仓有: -- Hub oepkgs: https://hub.oepkgs.net/ +- [hub.oepkgs.net](https://hub.oepkgs.net/) -- AtomHub: https://atomhub.openatom.cn/ +- [hub.docker.com](https://hub.docker.com/) +- [quay.io](https://quay.io/) -#### 参与贡献 +#### 镜像发布指南 -欢迎发表想法、提交问题、贡献代码。 +1. 提交镜像的PR合入后,会触发CI流程自动发布镜像。 +2. 镜像dockerfile文件新增和修改合入后,会触发CI流程自动发布镜像。 +3. 镜像README.md文件新增和修改合入后,会触发CI流程自动发布镜像README信息。 +4. 欢迎在`eulerPublisher`提交镜像的测试用例;当镜像没有测试用例时,自动发布流程中仅检查能否成功构建镜像。 \ No newline at end of file diff --git a/alertmanager/meta.yml b/alertmanager/meta.yml index aaa2076ee6669c6b30c38bbacefa33e02e3a4ae7..1e37b4a2fbd699ff6817876ff183d0f0ee7af485 100644 --- a/alertmanager/meta.yml +++ b/alertmanager/meta.yml @@ -1,2 +1,2 @@ 0.27.0-oe2203sp3: - - altermanager/0.27.0/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: altermanager/0.27.0/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/bind9/meta.yml b/bind9/meta.yml index f596b4c36e6484ece193534b622f617f36d3488a..adfae706993c24842c26ea0fe703aa2a1623b47f 100644 --- a/bind9/meta.yml +++ b/bind9/meta.yml @@ -1,2 +1,2 @@ 9.18.24-oe2203sp3: - - bind9/9.18.24/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: bind9/9.18.24/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/bisheng-jdk/meta.yml b/bisheng-jdk/meta.yml index 59d290770f0455642746936e0a7eb778de9b41f0..42bc5ec8d162bf8a93d6a3141aa9c5be6eef180c 100644 --- a/bisheng-jdk/meta.yml +++ b/bisheng-jdk/meta.yml @@ -1,6 +1,6 @@ 1.8.0-oe2203lts: - bisheng-jdk/1.8.0/22.03-lts/Dockerfile + path: bisheng-jdk/1.8.0/22.03-lts/Dockerfile 1.8.0-oe2203sp3: - bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile + path: bisheng-jdk/1.8.0/22.03-lts-sp3/Dockerfile 17.0.10-oe2203sp3: - bisheng-jdk/17.0.10/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: bisheng-jdk/17.0.10/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/bwa/meta.yml b/bwa/meta.yml index c3110f5436f8f5c8aa2296a7f0d281dd83ecde11..bee328dfa1e0cc2db4553c68376e21ef29b255a8 100644 --- a/bwa/meta.yml +++ b/bwa/meta.yml @@ -1,2 +1,2 @@ 0.7.18-oe2203sp3: - bwa/0.7.18/22.03-lts-sp3/Dcokerfile \ No newline at end of file + path: bwa/0.7.18/22.03-lts-sp3/Dcokerfile \ No newline at end of file diff --git a/cann/meta.yml b/cann/meta.yml index 43451cba784d632c455a16adf7f99e66cb3a5771..afa778316e2b619a0eae9d1df4fee0b276fad906 100644 --- a/cann/meta.yml +++ b/cann/meta.yml @@ -1,4 +1,2 @@ -# key为镜像的tag,value为构建对应tag镜像的Dockerfile保存路径 - cann7.0.RC1.alpha002-oe2203sp2: - - cann/7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile + path: cann/7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile diff --git a/dlrm/meta.yml b/dlrm/meta.yml index 07db36693748dbdb6f6670b3ae42f3ad4c85b168..1636977c6330fdee1d3530704b5f0dc398af747a 100644 --- a/dlrm/meta.yml +++ b/dlrm/meta.yml @@ -1,2 +1,2 @@ 1.0-oe2203sp3: - dlrm/1.0/22.03-lts-sp3/Dockerfile + path: dlrm/1.0/22.03-lts-sp3/Dockerfile diff --git a/dotnet-aspnet/meta.yml b/dotnet-aspnet/meta.yml index 5c4db1eff8a56da9fad2a3e96899917bd16b856c..5ca0b8ced80bc3b798c30ac7ecd252139753f6b7 100644 --- a/dotnet-aspnet/meta.yml +++ b/dotnet-aspnet/meta.yml @@ -1,2 +1,2 @@ 8.0.3-oe2203sp3: - dotnet-aspnet/8.0.3/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: dotnet-aspnet/8.0.3/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/dotnet-deps/meta.yml b/dotnet-deps/meta.yml index 24c7a255abd22d38a39380b94ae145233c42c753..1fc730aef4af4d08b0272bacc05dfa910c246a1b 100644 --- a/dotnet-deps/meta.yml +++ b/dotnet-deps/meta.yml @@ -1,2 +1,2 @@ 8.0-oe2203sp3: - - dotnet-deps/8.0/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: dotnet-deps/8.0/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/dotnet-runtime/meta.yml b/dotnet-runtime/meta.yml index 50c82d630fa953c5d67dec49e346d31b7b81daef..cbac1ae7f6861bf73e73177a6207dcd162303ca2 100644 --- a/dotnet-runtime/meta.yml +++ b/dotnet-runtime/meta.yml @@ -1,2 +1,2 @@ 8.0.3-oe2203sp3: - - dotnet-runtime/8.0.3/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: dotnet-runtime/8.0.3/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/go/1.22.5/22.03-lts-sp4/Dockerfile b/go/1.22.5/22.03-lts-sp4/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..90b033e195bafc6757e444b6b90b1ed5532765fd --- /dev/null +++ b/go/1.22.5/22.03-lts-sp4/Dockerfile @@ -0,0 +1,32 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp4 +FROM ${BASE} + +ARG TARGETARCH +ARG LOCAL_PATH=/usr/local + +ENV GOPATH=/go +ENV GOTOOLCHAIN=local +ENV GOLANG_VERSION=1.22.5 +ENV GO_ROOT=${LOCAL_PATH}/go +ENV PATH=$GOPATH/bin:$GO_ROOT/bin:$PATH + +RUN set -eux; \ + yum update -y && yum -y install g++ gcc glibc-devel make pkg-config findutils && yum clean all; \ + curl -fSL -o ${LOCAL_PATH}/go.tar.gz https://dl.google.com/go/go${GOLANG_VERSION}.linux-${TARGETARCH}.tar.gz; \ + tar -xvf ${LOCAL_PATH}/go.tar.gz -C ${LOCAL_PATH}; \ + rm -f ${LOCAL_PATH}/go.tar.gz + +RUN set -eux; \ + find ${GO_ROOT}/src -exec touch -r ${GO_ROOT}/VERSION "{}" \; && \ + touch ${GO_ROOT}/pkg; \ + find ${GO_ROOT}/pkg -exec touch -r ${GO_ROOT}/pkg "{}" \; && \ + mkdir -p ${GO_ROOT}/bin/linux_${TARGETARCH}; \ + ln -sf ${GO_ROOT}/bin/go ${GO_ROOT}/bin/linux_${TARGETARCH}/go; \ + ln -sf ${GO_ROOT}/bin/gofmt ${GO_ROOT}/bin/linux_${TARGETARCH}/gofmt + +RUN mkdir -p "$GOPATH/src" "$GOPATH/bin"; \ + chmod -R 1777 "$GOPATH" + +WORKDIR $GOPATH + +CMD ["go", "version"] \ No newline at end of file diff --git a/go/README.md b/go/README.md index 0359002c995eafe0b4d395300d3b197cb97acacd..86411330c7373bee6eb2b239c7f88e8d38342be5 100644 --- a/go/README.md +++ b/go/README.md @@ -1,53 +1,97 @@ -#golang - - # Quick reference -- The official golang 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) +- The official Go docker image. +- The official Go docker image. -# Build reference +- Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative). +- Maintained by: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative). -1. Build images and push: -```shell -docker buildx build -t "openeuler/golang:$VERSION" --platform linux/amd64,linux/arm64 . --push -``` +- Where to get help: [openEuler CloudNative SIG](https://gitee.com/openeuler/cloudnative), [openEuler](https://gitee.com/openeuler/community). -We are using `buildx` in here to generate multi-arch images, see more in [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) +# Go | openEuler -2. Run: -```shell -docker run -d openeuler/golang:1.17.3 -``` +Current Go(Golang) docker images are built on the [openEuler](https://repo.openeuler.org/). This repository is free to use and exempted from per-user rate limits. -# How to use this image -## Start a Go instance in your app -The most staightforward way to use this image is to use a Go container as both the build and runtime enviroment. -In your Dockfile, writhing something along the lines of the following will compile and run your project. -```shell -FROM openeuler/golang:1.17.3 +Go is expressive, concise, clean, and efficient. Its concurrency mechanisms make it easy to write programs that get the most out of multicore and networked machines, while its novel type system enables flexible and modular program construction. Go compiles quickly to machine code yet has the convenience of garbage collection and the power of run-time reflection. It's a fast, statically typed, compiled language that feels like a dynamically typed, interpreted language. -WORKDIR /app - -COPY go.mod go.sum ./ -RUN go mod download && go mod verify -COPY . . -RUN go build -v -o /usr/local/bin/app ./... - -CMD ["app"] -``` -You can then build and run the Docker image: -```shell -docker build -t my-golang-app . -docker run -it --rm --name my_app my-golang-app -``` +Learn more on [Go website](https://go.dev/doc/). # Supported tags and respective Dockerfile links -- 1.17.3-22.03-lts: golang v1.17.3, openEuler 22.03 LTS - -## Operating System -Linux/Unix, ARM64 or x86-64 architecture. +The tag of each Go docker image is consist of the version of Go and the version of basic image. The details are as follows +| Tags | Currently | Architectures| +|--|--|--| +|[1.17.3-oe2203lts](https://gitee.com/openeuler/openeuler-docker-images/blob/master/go/1.17.3/22.03-lts/Dockerfile)| go 1.17.3 on openEuler 22.03-LTS | amd64, arm64 | +|[1.22.5-oe2203sp4](https://gitee.com/openeuler/openeuler-docker-images/blob/master/go/1.22.5/22.03-lts-sp4/Dockerfile)| go 1.22.5 on openEuler 22.03-LTS-SP4 | amd64, arm64 | + +# Usage + +Note: `/go` is world-writable to allow flexibility in the user which runs the container (for example, in a container started with `--user 1000:1000`, running go get `github.com/example/...` into the default `$GOPATH` will succeed). While the `777` directory would be insecure on a regular host setup, there are not typically other processes or users inside the container, so this is equivalent to `700` for Docker usage, but allowing for `--user` flexibility. + + - Start a Go instance in your app + + The most straightforward way to use this image is to use a Go container as both the build and runtime environment. In your Dockerfile, writing something along the lines of the following will compile and run your project (assuming it uses go.mod for dependency management): + + ``` + # Dockerfile + FROM openeuler/go:1.22.5-oe2203sp4 + + WORKDIR /usr/src/app + COPY go.mod go.sum ./ + RUN go mod download && go mod verify + COPY . . + RUN go build -v -o /usr/local/bin/app ./... + CMD ["app"] + ``` + + You can then build and run the Docker image: + ``` + docker build -t my-golang-app . + docker run -it --rm --name my-running-app my-golang-app + ``` + + - Compile your app inside the Docker container + + There may be occasions where it is not appropriate to run your app inside a container. To compile, but not run your app inside the Docker instance, you can write something like: + ``` + docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp openeuler/go:1.22.5-oe2203sp4 go build -v + ``` + This will add your current directory as a volume to the container, set the working directory to the volume, and run the command go build which will tell go to compile the project in the working directory and output the executable to myapp. Alternatively, if you have a Makefile, you can run the make command inside your container. + ``` + docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp openeuler/go:1.22.5-oe2203sp4 make + ``` + + - Cross-compile your app inside the Docker container + If you need to compile your application for a platform other than linux/amd64 (such as windows/386): + ``` + docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp -e GOOS=windows -e GOARCH=386 openeuler/go:1.22.5-oe2203sp4 go build -v + ``` + Alternatively, you can build for multiple platforms at once: + ```bash + + # First, start a Go instance + docker run --rm -it -v "$PWD":/usr/src/myapp -w /usr/src/myapp openeuler/go:1.22.5-oe2203sp4 bash + + # Second, build for multiple platforms + for GOOS in darwin linux; do + for GOARCH in 386 amd64; do + export GOOS GOARCH + go build -v -o myapp-$GOOS-$GOARCH + done + done + ``` + +- View container running logs + + ```bash + docker logs -f my-go + ``` + +- To get an interactive shell + + ```bash + docker exec -it my-go /bin/bash + ``` + +# Question and answering +If you have any questions or want to use some special features, please submit an issue or a pull request on [openeuler-docker-images](https://gitee.com/openeuler/openeuler-docker-images). \ No newline at end of file diff --git a/go/doc/image-info.yml b/go/doc/image-info.yml new file mode 100644 index 0000000000000000000000000000000000000000..d056ece69931cb04df9d55deb220255fb29dd332 --- /dev/null +++ b/go/doc/image-info.yml @@ -0,0 +1,93 @@ +name: go +category: others +description: Go(又称 Golang)是 Google 的 Robert Griesemer,Rob Pike 及 Ken Thompson 开发的一种静态强类型、编译型语言。Go 语言语法与 C 相近,但功能上有:内存安全,GC(垃圾回收),结构形态及 CSP-style 并发计算。 +environment: | + 本应用在Docker环境中运行,安装Docker执行如下命令 + ``` + yum install -y docker + ``` +tags: | + Go镜像的Tag由其版本信息和基础镜像版本信息组成,详细内容如下 + + | Tag | Currently | Architectures | + |----------|-------------|------------------| + |[1.17.3-oe2203lts](https://gitee.com/openeuler/openeuler-docker-images/blob/master/go/1.17.3/22.03-lts/Dockerfile)| go 1.17.3 on openEuler 22.03-LTS | amd64, arm64 | + |[1.22.5-oe2203sp4](https://gitee.com/openeuler/openeuler-docker-images/blob/master/go/1.22.5/22.03-lts-sp4/Dockerfile)| go 1.22.5 on openEuler 22.03-LTS-SP4 | amd64, arm64 | + + 注意,以下`{Tag}`的值按照需求,替换为上述表格中的tag内容。 + +download: | + 拉取镜像到本地 + ``` + docker pull openeuler/go:{Tag} + ``` + +usage: | + `openeuler/go`最直接的方法是作为构建和运行时环境,编写类似以下内容的Dockerfile代码编译和运行: + - 运行Go实例 + 使用`openeuler/go`容器作为构建和运行时环境,可按照以下内容编译并运行项目 + ``` + # Dockerfile + FROM openeuler/go:1.22.5-oe2203sp4 + + WORKDIR /usr/src/app + COPY go.mod go.sum ./ + RUN go mod download && go mod verify + COPY . . + RUN go build -v -o /usr/local/bin/app ./... + CMD ["app"] + ``` + + 构建并运行Docker容器 + ``` + docker build -t my-golang-app . + docker run -it --rm --name my-running-app my-golang-app + ``` + + - 编译Go项目 + + 在某些情况下,在容器内运行应用程序可能并不合适。要编译但不在Docker实例内运行应用程序,可采用如下方式: + ``` + docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp openeuler/go:1.22.5-oe2203sp4 go build -v + ``` + 这会将当前目录作为卷添加到容器中,将工作目录设置为该卷,然后运行执行`go build`编译项目中的代码,输出为可执行文件myapp。如果项目中包含Makefile编译文件,可以在容器内通过make命令编译: + ``` + docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp openeuler/go:1.22.5-oe2203sp4 make + ``` + + - 交叉编译 + + 如果需要为除去linux/amd64之外的其他平台编译应用(例如:windows/386), 可采用如下方式: + ``` + docker run --rm -v "$PWD":/usr/src/myapp -w /usr/src/myapp -e GOOS=windows -e GOARCH=386 openeuler/go:1.22.5-oe2203sp4 go build -v + ``` + 或者,多平台同时构建如下: + ``` + # 第一步, 运行Go容器 + docker run --rm -it -v "$PWD":/usr/src/myapp -w /usr/src/myapp openeuler/go:1.22.5-oe2203sp4 bash + + # 第二步,多平台构建应用 + for GOOS in darwin linux; do + for GOARCH in 386 amd64; do + export GOOS GOARCH + go build -v -o myapp-$GOOS-$GOARCH + done + done + ``` + + - 容器测试 + + 使用以下方式验证镜像内安装的Go环境: + ``` + docker run -it openeuler/go:{Tag} go --version + ``` + 例如,`{Tag}`为`1.22.5-oe2203sp4`时,返回类似如下信息则证明环境正常: + ``` + go version go1.22.5 linux/amd64 + ``` + +license: BSD 3-Clause license +similar_packages: + - N/A +dependency: + - N/A \ No newline at end of file diff --git a/go/doc/picture/logo.png b/go/doc/picture/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..7931b692996253a04a7088f9a5d7513e823a08bf Binary files /dev/null and b/go/doc/picture/logo.png differ diff --git a/go/meta.yml b/go/meta.yml new file mode 100644 index 0000000000000000000000000000000000000000..88075f6dcf6a2a62d7c92b12cd26d79da92c6fb7 --- /dev/null +++ b/go/meta.yml @@ -0,0 +1,4 @@ +1.17.3-oe2203lts: + path: go/1.17.3/22.03-lts/Dockerfile +1.22.5-oe2203sp4: + path: go/1.22.5/22.03-lts-sp4/Dockerfile \ No newline at end of file diff --git a/grafana-agent/meta.yml b/grafana-agent/meta.yml index 64713ecd128d615c430ddfeeb942250d05087ab0..7b2ac1eddcae18c1c614f1c22f9e3f3e8a750699 100644 --- a/grafana-agent/meta.yml +++ b/grafana-agent/meta.yml @@ -1,2 +1,2 @@ 0.40.2-oe2203sp3: - - grafana-agent/0.40.2/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: grafana-agent/0.40.2/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/grafana/meta.yml b/grafana/meta.yml index e38c3011069b13d8cae92367edfc58c368d9563c..f8e402926979d9b35f3dae13f92bfd165a577278 100644 --- a/grafana/meta.yml +++ b/grafana/meta.yml @@ -1,4 +1,4 @@ 7.5.11-oe2203lts: - grafana/7.5.11/22.03-lts/Dockerfile + path: grafana/7.5.11/22.03-lts/Dockerfile 10.4.1-oe2203sp3: - grafana/10.4.1/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: grafana/10.4.1/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/httpd/meta.yml b/httpd/meta.yml index a99328e82e14c89ee558330c1076a4d889b33024..5b77d0509ae276bd8334cb5f0c0955b2972dd456 100644 --- a/httpd/meta.yml +++ b/httpd/meta.yml @@ -1,4 +1,4 @@ 2.4.51-oe2203lts: - - 2.4.51/22.03-lts/Dockerfile + path: 2.4.51/22.03-lts/Dockerfile 2.4.58-oe2203sp3: - - 2.4.58/22.03-lts-sp3/Dockerfile + path: 2.4.58/22.03-lts-sp3/Dockerfile diff --git a/kafka/meta.yml b/kafka/meta.yml index 4292c36e5ad3822f8c3efeb082766c4bf197ce6c..66a6abd8a52e6c305a5f59ada4f6746fa4d0a47f 100644 --- a/kafka/meta.yml +++ b/kafka/meta.yml @@ -1,2 +1,2 @@ 3.7.0-oe2203sp3: - - kafka/3.7.0/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: kafka/3.7.0/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/llm-server/meta.yml b/llm-server/meta.yml index a7c6d880c1b4e3dbeda651652fa523ef649dd352..5d5a000bfd6891fb974ec6b46fa0c0173b0e8a5a 100644 --- a/llm-server/meta.yml +++ b/llm-server/meta.yml @@ -1,4 +1,4 @@ 1.0.0.gpu-oe2203sp3: - llm-server/1.0.0.gpu/22.03-lts-sp3/Dockerfile + path: llm-server/1.0.0.gpu/22.03-lts-sp3/Dockerfile 1.0.0.cpu-oe2203sp3: - llm-server/1.0.0.cpu/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: llm-server/1.0.0.cpu/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/llm/meta.yml b/llm/meta.yml index 7cef3906033c256641ce309b65768447e8efb712..5182006b6b199b75abd83473d286548a62503de9 100644 --- a/llm/meta.yml +++ b/llm/meta.yml @@ -1,7 +1,4 @@ -# key为镜像的tag,value为构建对应tag镜像的Dockerfile保存路径 - fastchat-pytorch2.1.0.a1-cann7.0.RC1.alpha002-oe2203sp2: - - llm/fastchat/22.03-lts-sp2/Dockerfile - + path: llm/fastchat-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002-oe2203sp2: - - llm/chatglm2_6b/22.03-lts-sp2/Dockerfile \ No newline at end of file + path: llm/chatglm2_6b-pytorch2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile \ No newline at end of file diff --git a/loki/meta.yml b/loki/meta.yml index cc7160e033989bd51e797b26e54dc27c71d3a24f..7482ed00a8299765471cb9669d5ce6b1109fcb67 100644 --- a/loki/meta.yml +++ b/loki/meta.yml @@ -1,2 +1,2 @@ 2.9.5-oe2203sp3: - - loki/2.9.5/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: loki/2.9.5/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/memcached/meta.yml b/memcached/meta.yml index 18a3719d360b9484f9cfb32dca85b7d4fad28ce9..b6c1b70238178de3ba6f2a7f11f3fcf7339ac600 100644 --- a/memcached/meta.yml +++ b/memcached/meta.yml @@ -1,4 +1,4 @@ 1.6.12-oe2203lts: - memcached/1.6.12/22.03-lts/Dockerfile + path: memcached/1.6.12/22.03-lts/Dockerfile 1.6.24-oe2203sp3: - memcached/1.6.24/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: memcached/1.6.24/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/mimir/meta.yml b/mimir/meta.yml index 85284fddb470285cf9e55272d8b022837e51ab56..6695ee8d55f9f59d35810eddd607f36b5f23e494 100644 --- a/mimir/meta.yml +++ b/mimir/meta.yml @@ -1,2 +1,2 @@ 2.11.0-oe2203sp3: - - mimir/2.11.0/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: mimir/2.11.0/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/mlflow/meta.yml b/mlflow/meta.yml index c7ee2f0b7f9048661d25c72fc3c66aef59e51315..16924cfa20b82bd44e5574c7a46f0b696ebab19f 100644 --- a/mlflow/meta.yml +++ b/mlflow/meta.yml @@ -1,5 +1,4 @@ 2.11.1-oe2203sp3: - mlflow/2.11.1/22.03-lts-sp3/Dockerfile - + path: mlflow/2.11.1/22.03-lts-sp3/Dockerfile 2.13.1-oe2203sp3: - mlflow/2.13.1/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: mlflow/2.13.1/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/mysql/meta.yml b/mysql/meta.yml index 6d231d7ce21b78cf087658a505ab42a9a1c3b383..3f9f90bf3f048c9ebb74b8bad031ce896345572d 100644 --- a/mysql/meta.yml +++ b/mysql/meta.yml @@ -1,2 +1,2 @@ 8.3.0-oe2203sp3: - mysql/8.3.0/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: mysql/8.3.0/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/nginx/1.25.4/22.03-lts-sp3/Dockerfile b/nginx/1.25.4/22.03-lts-sp3/Dockerfile index 075d679442b74048b6a892fabc23698dbef867a8..c28c545906b36764833ffaf2bf8263d65d04e99f 100644 --- a/nginx/1.25.4/22.03-lts-sp3/Dockerfile +++ b/nginx/1.25.4/22.03-lts-sp3/Dockerfile @@ -4,36 +4,17 @@ FROM ${BASE} ARG TARGETARCH ARG VERSION=1.25.4 -RUN yum -y install gcc openssl-devel make libxml2-devel libxslt-devel gd-devel perl\ - GeoIP-devel gperftools-devel && \ - yum clean all && \ - curl -o /tmp/nginx.tar.gz https://nginx.org/download/nginx-${VERSION}.tar.gz && \ +RUN yum -y install gcc openssl-devel make && \ + yum clean all + +RUN curl -o /tmp/nginx.tar.gz https://nginx.org/download/nginx-${VERSION}.tar.gz && \ tar -zxvf /tmp/nginx.tar.gz -C /tmp && \ cd /tmp/nginx-${VERSION} && \ - mkdir -p /var/tmp/nginx/ && \ ./configure \ - --prefix=/usr/local/nginx --sbin-path=/usr/sbin/nginx \ - --modules-path=/usr/local/nginx/modules --conf-path=/etc/nginx/nginx.conf \ - --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log \ - --http-client-body-temp-path=/var/tmp/nginx/client \ - --http-fastcgi-temp-path=/var/tmp/nginx/fcgi \ - --http-proxy-temp-path=/var/tmp/nginx/proxy \ - --http-scgi-temp-path=/var/tmp/nginx/scgi \ - --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/run/nginx.lock \ - --with-file-aio --with-ipv6 --with-http_ssl_module --with-http_v2_module \ - --with-http_realip_module --with-http_addition_module \ - --with-http_xslt_module=dynamic --with-http_image_filter_module=dynamic \ - --with-http_geoip_module=dynamic --with-http_sub_module \ - --with-http_dav_module --with-http_flv_module --with-http_mp4_module \ - --with-http_gunzip_module --with-http_gzip_static_module \ - --with-http_random_index_module --with-http_secure_link_module \ - --with-http_degradation_module --with-http_slice_module \ - --with-http_perl_module=dynamic --with-http_auth_request_module \ - --with-mail=dynamic --with-mail_ssl_module --with-openssl-opt=yes \ - --with-pcre --with-pcre-jit --with-stream=dynamic \ - --with-stream_ssl_module --with-google_perftools_module --with-debug && \ + --sbin-path=/usr/local/nginx \ + --conf-path=/etc/nginx/nginx.conf \ + --pid-path=/usr/local/nginx/nginx.pid \ + --with-http_ssl_module && \ make && make install && \ rm -rf /tmp/nginx.tar.gz /tmp/nginx-${VERSION} diff --git a/nginx/meta.yml b/nginx/meta.yml index 31899c1d0d97ea320168b6ed6492e5066fb98f26..fc135e09f5715f8f049baf32b52dbc819e3c427a 100644 --- a/nginx/meta.yml +++ b/nginx/meta.yml @@ -1,8 +1,6 @@ 1.16.1-oe2003sp1: - nginx/1.16.1/20.03-lts-sp1/Dockerfile - + path: nginx/1.16.1/20.03-lts-sp1/Dockerfile 1.21.5-oe2203lts: - nginx/1.21.5/22.03-lts/Dockerfile - + path: nginx/1.21.5/22.03-lts/Dockerfile 1.25.4-oe2203sp3: - nginx/1.25.4/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: nginx/1.25.4/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/oneapi-basekit/meta.yml b/oneapi-basekit/meta.yml index 4864270a84eb8100c9cac851f329fc2acfb56ae8..84feba9ae765484625028a8f0d617a98cbd4d981 100644 --- a/oneapi-basekit/meta.yml +++ b/oneapi-basekit/meta.yml @@ -1,4 +1,3 @@ -# key is the image tag, value is the Dockerfile path for creating the image with corresponding tag - 2024.2.0-oe2403lts: - - oneapi-basekit/2024.2.0/24.03-lts/Dockerfile + path: oneapi-basekit/2024.2.0/24.03-lts/Dockerfile + arch: x86_64 diff --git a/oneapi-runtime/meta.yml b/oneapi-runtime/meta.yml index 6f47f37288b3ee3ad7691cd97b3fa9f2758e6c5c..9203d156839ba7dda7681f47e990ad665946b231 100644 --- a/oneapi-runtime/meta.yml +++ b/oneapi-runtime/meta.yml @@ -1,4 +1,3 @@ -# key is the image tag, value is the Dockerfile path for creating the image with corresponding tag - 2024.2.0-oe2403lts: - - oneapi-runtime/2024.2.0/24.03-lts/Dockerfile + path: oneapi-runtime/2024.2.0/24.03-lts/Dockerfile + arch: x86_64 diff --git a/openjdk/meta.yml b/openjdk/meta.yml index 3828a1b30d148df8f5d863587e43f27b5c9e93be..a114052e63e57d8632e6f874bdeca9d8228093b8 100644 --- a/openjdk/meta.yml +++ b/openjdk/meta.yml @@ -1,3 +1,3 @@ # "23+13" is invalid as a tag 23_13-oe2203sp3: - openjdk/23+13/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: openjdk/23+13/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/postgres/meta.yml b/postgres/meta.yml index 6b6b831e0ff02a0a34b29f0a78483b214d499cac..53d35e708b4e75d6e6f62a4665fc69e372a2e29b 100644 --- a/postgres/meta.yml +++ b/postgres/meta.yml @@ -1,4 +1,4 @@ 13.3-oe2203lts: - postgres/13.3/22.03-lts/Dockerfile + path: postgres/13.3/22.03-lts/Dockerfile 16.2-oe2203sp3: - postgres/16.2/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: postgres/16.2/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/prometheus-pushgateway/meta.yml b/prometheus-pushgateway/meta.yml index b87c5861529263daf1bd95e32edb852f9df2ed58..4ec8ec57dec256afc174966501b8340cb50003ed 100644 --- a/prometheus-pushgateway/meta.yml +++ b/prometheus-pushgateway/meta.yml @@ -1,2 +1,2 @@ 1.7.0-oe2203sp3: - prometheus-pushgateway/1.7.0/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: prometheus-pushgateway/1.7.0/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/prometheus/meta.yml b/prometheus/meta.yml index 77acd0d93973556db04500b276ed5759e5b4abf7..7b9c23766dc4ce4326f6658b55db1c0ea6459ce7 100644 --- a/prometheus/meta.yml +++ b/prometheus/meta.yml @@ -1,4 +1,4 @@ 2.50.1-oe2203sp3: - - prometheus/2.50.1/22.03-lts-sp3/Dockerfile + path: prometheus/2.50.1/22.03-lts-sp3/Dockerfile 2.20.0-oe2203lts: - - prometheus/2.20.0/22.03-lts/Dockerfile \ No newline at end of file + path: prometheus/2.20.0/22.03-lts/Dockerfile \ No newline at end of file diff --git a/pytorch/meta.yml b/pytorch/meta.yml index 655047efaaa6c2e5340e38993ba182a6416797ce..c3ea7b24c265afb46e15d802658c5d4dfb423664 100644 --- a/pytorch/meta.yml +++ b/pytorch/meta.yml @@ -1,2 +1,2 @@ pytorch2.1.0.a1-cann7.0.RC1.alpha002-oe2203sp2: - pytorch/2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile + path: pytorch/2.1.0.a1-cann7.0.RC1.alpha002/22.03-lts-sp2/Dockerfile diff --git a/redis/meta.yml b/redis/meta.yml index 8c0ea626b12a3da101c9ded16a8ab60d3103cfe4..be40f0359b51c4658a1d19ad3ba797c01b1c2093 100644 --- a/redis/meta.yml +++ b/redis/meta.yml @@ -1,4 +1,4 @@ 6.2.7-oe2203lts: - redis/6.2.7/22.03-lts/Dockerfile + path: redis/6.2.7/22.03-lts/Dockerfile 7.2.4-oe2203sp3: - redis/7.2.4/22.03-lts-sp3/Dcokerfile \ No newline at end of file + path: redis/7.2.4/22.03-lts-sp3/Dcokerfile \ No newline at end of file diff --git a/spark/meta.yml b/spark/meta.yml index b4a950c82a39932ceb7bff5649d6e97933d12396..7c93ed9c7c8480359337be20239748d1f752452c 100644 --- a/spark/meta.yml +++ b/spark/meta.yml @@ -1,11 +1,8 @@ 3.3.1-oe2203lts: - spark/3.3.1/22.03-lts/Dockerfile - + path: spark/3.3.1/22.03-lts/Dockerfile 3.3.2-oe2203lts: - spark/3.3.2/22.03-lts/Dockerfile - + path: spark/3.3.2/22.03-lts/Dockerfile 3.4.0-oe2203lts: - spark/3.4.0/22.03-lts/Dockerfile - + path: spark/3.4.0/22.03-lts/Dockerfile 3.5.1-oe2403lts: - spark/3.5.1/24.03-lts/Dockerfile \ No newline at end of file + path: spark/3.5.1/24.03-lts/Dockerfile \ No newline at end of file diff --git a/squid/meta.yml b/squid/meta.yml index f97598a5cab560a91cc24a0891132a1f2390adf2..bc5afa36149ec02a7deeda7411ae43ac2e95a89c 100644 --- a/squid/meta.yml +++ b/squid/meta.yml @@ -1,2 +1,2 @@ 6.8-oe2203sp3: - - squid/6.8/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: squid/6.8/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/telegraf/meta.yml b/telegraf/meta.yml index a16720f317e35b521cd97f97b10a56a72833f549..4ff2d5e0aee9aaf0438dde4f98ad8262294a4849 100644 --- a/telegraf/meta.yml +++ b/telegraf/meta.yml @@ -1,2 +1,2 @@ 1.29.5-oe2203sp3: - telegraf/1.29.5/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: telegraf/1.29.5/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/traefik/meta.yml b/traefik/meta.yml index f306dbd3771ab96fcd0867fbac3e3cf35f1fb1b8..b0b22366c6165370fe224c61c034716b0569455b 100644 --- a/traefik/meta.yml +++ b/traefik/meta.yml @@ -1,2 +1,2 @@ 2.11.0-oe2203sp3: - - traefik/2.11.0/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: traefik/2.11.0/22.03-lts-sp3/Dockerfile \ No newline at end of file diff --git a/zookeeper/meta.yml b/zookeeper/meta.yml index 2fb41d2b2595d94985914221bc19ebe4a1983969..1dc738669772552e6402e248e40bef629b9ead9e 100644 --- a/zookeeper/meta.yml +++ b/zookeeper/meta.yml @@ -1,2 +1,2 @@ 3.8.3-oe2203sp3: - zookeeper/3.8.3/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: zookeeper/3.8.3/22.03-lts-sp3/Dockerfile \ No newline at end of file