Skip to content

Commit 1fb1e6e

Browse files
committed
update for prod
1 parent d8ea2e7 commit 1fb1e6e

File tree

2 files changed

+16
-25
lines changed

2 files changed

+16
-25
lines changed

.github/workflows/main.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,19 @@ jobs:
3434
curl 'https://dl.dell.com/FOLDER12638439M/1/Dell-iDRACTools-Web-LX-11.3.0.0-795_A00.tar.gz?uid=a19a6035-6a13-48b9-1fd5-4587c4944a96&fn=Dell-iDRACTools-Web-LX-11.3.0.0-795_A00.tar.gz' \
3535
-H 'user-agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36' \
3636
--output idrac-tools.tar.gz
37-
tar -xzf idrac-tools.tar.gz -C docker
38-
pwd
39-
ls -la
40-
ls -lR docker
37+
tar -xzf idrac-tools.tar.gz -C docker
38+
if [ $$? -ne 0 ]; then
39+
echo "Failed to download iDRACTools. Please check the URL or your network connection."
40+
exit 1
41+
fi
42+
ls -lR docker/iDRACTools/racadm/UBUNTU22/x86_64
4143
docker build -t ghcr.io/cybozu-go/setup-hw:latest --target stage1 docker
44+
if [ $$? -ne 0 ]; then
45+
echo "Failed to build the setup-hw image. Please check the Dockerfile and the build context."
46+
exit 1
47+
fi
4248
docker build -t ghcr.io/cybozu-go/setup-hw-secret:latest docker
49+
if [ $$? -ne 0 ]; then
50+
echo "Failed to build the setup-hw-secret image. Please check the Dockerfile and the build context."
51+
exit 1
52+
fi

docker/Dockerfile

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,9 @@ LABEL org.opencontainers.image.source="https://github.com/cybozu-go/setup-hw"
1919

2020
RUN mkdir /pkg
2121
COPY iDRACTools/racadm/UBUNTU22/x86_64/*.deb /pkg/
22-
RUN apt-get update -y && apt-get install /pkg/srvadmin-hapi_11.3.0.0_amd64.deb /pkg/srvadmin-idracadm7_11.3.0.0_all.deb /pkg/srvadmin-idracadm8_11.3.0.0_amd64.deb
22+
#RUN apt-get update -y && apt-get install /pkg/srvadmin-hapi_11.3.0.0_amd64.deb /pkg/srvadmin-idracadm7_11.3.0.0_all.deb /pkg/srvadmin-idracadm8_11.3.0.0_amd64.deb
23+
RUN apt-get update -y && apt-get install /pkg/*.deb
2324

2425
RUN apt-get clean \
2526
&& rm -rf /pkg \
2627
&& rm -rf /var/lib/apt/lists/*
27-
28-
# See https://linux.dell.com/repo/community/openmanage/
29-
#ARG OMSA_VERSION=11100
30-
#ARG UBUNTU_VERSION=jammy
31-
32-
# Setup DELL repository
33-
#RUN apt-get update -y && apt-get install -y --no-install-recommends wget gnupg ca-certificates curl\
34-
# && echo "deb http://linux.dell.com/repo/community/openmanage/${OMSA_VERSION}/${UBUNTU_VERSION} ${UBUNTU_VERSION} main" | tee -a /etc/apt/sources.list.d/linux.dell.com.sources.list \
35-
# && wget https://linux.dell.com/repo/pgp_pubkeys/0x1285491434D8786F.asc \
36-
# && apt-key add 0x1285491434D8786F.asc \
37-
# && rm 0x1285491434D8786F.asc
38-
#COPY Dell-iDRACTools-Web-LX-11.3.0.0-795_A00.tar.gz /tmp
39-
40-
# To avoid error postinstall script of srvadmin-all in the contaioner enviroment.
41-
42-
# Install DELL's tools
43-
# monitor-hw call /usr/libexec/instsvcdrv-helper which depends on "kmod" package. We must install "kmod"
44-
# && ln -s /usr/lib/x86_64-linux-gnu/libssl.so.3 /usr/lib/libssl.so \
45-
# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends srvadmin-all srvadmin-idracadm8 kmod \
46-
# && rm /usr/bin/systemctl

0 commit comments

Comments
 (0)