Skip to content

Commit 8654130

Browse files
authored
Merge pull request #871 from hangscer8/work_with_oracle_8
work with oracle 8
2 parents 1d44c57 + fd81397 commit 8654130

File tree

4 files changed

+26
-1
lines changed

4 files changed

+26
-1
lines changed

.github/workflows/call-os-pkgs-build.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
dockerfile: build/os-packages/Dockerfile.kylinv10
2020
- name: openeuler22.03
2121
dockerfile: build/os-packages/Dockerfile.openeuler22.03
22+
- name: oracle8
23+
dockerfile: build/os-packages/Dockerfile.oracle8
2224
- name: oracle9
2325
dockerfile: build/os-packages/Dockerfile.oracle9
2426
- name: tencent31
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
ARG OS_NAME=oracle
2+
3+
FROM oraclelinux:8 as os-ol8
4+
ARG OS_NAME
5+
ARG OS_VERSION=8
6+
ARG BUILD_TOOLS="yum-utils createrepo"
7+
8+
WORKDIR /$OS_NAME/$OS_VERSION/os
9+
COPY build/os-packages/packages.yml .
10+
COPY --from=mikefarah/yq:4.30.8 /usr/bin/yq /usr/bin/yq
11+
RUN yq eval '.oracle8[]' packages.yml > packages.list
12+
13+
RUN ARCH=$(uname -m) \
14+
&& dnf install -y ${BUILD_TOOLS} \
15+
&& while read -r line; do dnf install -y --downloadonly --downloaddir=${ARCH} ${line}; done <<<"$(sort -u packages.list)" \
16+
&& createrepo -d ${ARCH}
17+
18+
FROM scratch
19+
ARG OS_NAME
20+
COPY --from=os-ol8 /$OS_NAME /resources/$OS_NAME

build/os-packages/check_rebuild_pkgs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fi
2828
git diff --quiet "${prev_tag}" "${late_tag}" "build/os-packages/Dockerfile.${OS_NAME}" || { echo "true"; exit; }
2929

3030
# centos7 / kylinv10 / redhat7 / redhat8
31-
if [ "${OS_NAME}" == "centos7" ] || [ "${OS_NAME}" == "kylinv10" ] || [ "${OS_NAME}" == "redhat7" ] || [ "${OS_NAME}" == "redhat8" ]; then
31+
if [ "${OS_NAME}" == "centos7" ] || [ "${OS_NAME}" == "kylinv10" ] || [ "${OS_NAME}" == "redhat7" ] || [ "${OS_NAME}" == "redhat8" ] || [ "${OS_NAME}" == "oracle8" ] || [ "${OS_NAME}" == "oracle9" ] || [ "${OS_NAME}" == "tencent31" ]; then
3232
late_digest=$(echo "${late_packages_yml}" | yq eval ".yum[],.${OS_NAME}[]" | sort | sha1sum | awk '{print $1}')
3333
prev_digest=$(echo "${prev_packages_yml}" | yq eval ".yum[],.${OS_NAME}[]" | sort | sha1sum | awk '{print $1}')
3434
if [ "${late_digest}" == "${prev_digest}" ]; then

build/os-packages/packages.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ openeuler:
6363
oracle9:
6464
- socat
6565

66+
oracle8:
67+
- socat
68+
6669
tencentos31:
6770
- nss
6871
- socat

0 commit comments

Comments
 (0)