Update Dockerfile and Makefile for formal OMSA (#146)

* Dockerfile and Makefule for formal OMSA

Signed-off-by: Maho Takara <[email protected]>

* Update for change request

Signed-off-by: Maho Takara <[email protected]>

---------

Signed-off-by: Maho Takara <[email protected]>

Author: takara9

.github/workflows/main.yaml

@@ -26,6 +26,9 @@ jobs:
       - name: Run test
         run: make test
 
+      - name: Download iDRAC Tools
+        run: make download-idractools
+
       - name: Build binaries
         run: make install GOBIN=`pwd`/docker
 

.github/workflows/release.yaml

@@ -19,6 +19,9 @@ jobs:
       - name: setup
         run: make setup 
 
+      - name: Download iDRAC Tools
+        run: make download-idractools
+
       - name: Build binaries
         run: make install GOBIN=`pwd`/docker
 

.gitignore

@@ -3,3 +3,4 @@
 \#*#
 .*.swp
 /.vscode
+*.tar.gz

Makefile

@@ -42,6 +42,15 @@ ifdef GOBIN
 endif
 	GOBIN=$(GOBIN) CGO_ENABLED=0 go install -ldflags="-s -w" $(foreach f, $(BINS), ./pkg/$(f))
 
+.PHONY: download-idractools
+download-idractools:
+	# Must change the URL to the latest version of iDRAC Tools.
+	# Please see https://www.dell.com/support/home/ja-jp/drivers/driversdetails?driverid=mfv7t
+	curl 'https://dl.dell.com/FOLDER12638439M/1/Dell-iDRACTools-Web-LX-11.3.0.0-795_A00.tar.gz' \
+		-H 'user-agent: setup-hw' \
+		--output idrac-tools.tar.gz
+	tar -xzf idrac-tools.tar.gz -C docker
+
 build-image: install
 ifdef GOBIN
 	mkdir -p $(GOBIN)
@@ -51,4 +60,4 @@ else
 endif
 	cd docker && docker build -t ghcr.io/cybozu-go/setup-hw:dev .
 
-.PHONY: all generate check-generate setup test install build-image
+.PHONY: all generate check-generate setup test install download-idractools build-image

docker/.gitignore

@@ -4,3 +4,6 @@ monitor-hw
 setup-apply-firmware
 setup-hw
 setup-isoreboot
+COPYRIGHT.txt
+iDRACTools/
+license.txt

docker/Dockerfile

@@ -6,29 +6,25 @@ COPY monitor-hw /usr/local/sbin/monitor-hw
 COPY collector /usr/local/sbin/collector
 COPY setup-apply-firmware /usr/local/sbin/setup-apply-firmware
 COPY setup-isoreboot /usr/local/sbin/setup-isoreboot
+
 CMD ["/usr/local/sbin/monitor-hw"]
 
 # Install vendor tools
 FROM stage1
 LABEL org.opencontainers.image.source="https://github.com/cybozu-go/setup-hw"
 
-# See https://linux.dell.com/repo/community/openmanage/
-ARG OMSA_VERSION=11100
-ARG UBUNTU_VERSION=jammy
-
-# Setup DELL repository
-RUN apt-get update -y && apt-get install -y --no-install-recommends wget gnupg ca-certificates curl\
-    && 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 \
-    && wget https://linux.dell.com/repo/pgp_pubkeys/0x1285491434D8786F.asc \
-    && apt-key add 0x1285491434D8786F.asc \
-    && rm 0x1285491434D8786F.asc
-
-# To avoid error postinstall script of srvadmin-all in the contaioner enviroment.
+# Do not delete the following line to prevent installation errors in a container environment.
 COPY systemctl-dummy /usr/bin/systemctl
 
-# Install DELL's tools
-# monitor-hw call /usr/libexec/instsvcdrv-helper which depends on "kmod" package. We must install "kmod"
 RUN apt-get update -y \
-    && ln -s /usr/lib/x86_64-linux-gnu/libssl.so.3 /usr/lib/libssl.so \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends srvadmin-all srvadmin-idracadm8 kmod \
-    && rm /usr/bin/systemctl
+    && apt-get install -y --no-install-recommends pciutils libargtable2-0 kmod
+
+RUN mkdir /pkg
+COPY iDRACTools/racadm/UBUNTU22/x86_64/*.deb /pkg/
+RUN dpkg -i /pkg/srvadmin-hapi_11.3.0.0_amd64.deb \
+    && dpkg -i /pkg/srvadmin-idracadm7_11.3.0.0_all.deb \
+    && dpkg -i /pkg/srvadmin-idracadm8_11.3.0.0_amd64.deb
+
+RUN apt-get clean \
+    && rm -rf /pkg \
+    && rm -rf /var/lib/apt/lists/*