Fix multi-arch builds.

aebruno · aebruno · commit ba8ed1e760b1 · 2022-06-15T04:03:36.000Z
diff --git a/base/Dockerfile b/base/Dockerfile
@@ -6,7 +6,5 @@ ARG TARGETARCH
 
 FROM stage-${TARGETARCH} as final
 
-ARG TARGETARCH
-
 COPY . /build
 RUN /build/install.sh && rm -rf /build
diff --git a/base/install.sh b/base/install.sh
@@ -7,9 +7,11 @@ log_info() {
   printf "\n\e[0;35m $1\e[0m\n\n"
 }
 
-TARGETARCH=${TARGETARCH:-amd64}
+ARCHTYPE=`uname -m`
 GOSU_VERSION=${GOSU_VERSION:-1.12}
 
+log_info "HPCTS Base image for $ARCHTYPE"
+
 source /build/base.config
 
 #------------------------
@@ -136,7 +138,11 @@ chmod 0440 /etc/sudoers.d/90-hpcadmin
 # Install gosu
 #------------------------
 log_info "Installing gosu.."
-wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$TARGETARCH"
+if [[ "${ARCHTYPE}" = "x86_64" ]]; then
+    wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64"
+elif [[ "${ARCHTYPE}" = "aarch64" ]]; then
+    wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-arm64"
+fi
 chmod +x /usr/local/bin/gosu
 gosu nobody true
 
diff --git a/coldfront/Dockerfile b/coldfront/Dockerfile
@@ -8,8 +8,6 @@ ARG TARGETARCH
 
 FROM stage-${TARGETARCH} as final
 
-ARG TARGETARCH
-
 COPY . /build
 RUN /build/install.sh && rm -rf /build
 COPY --chown=coldfront:coldfront local_settings.py /etc/coldfront/local_settings.py
diff --git a/coldfront/install.sh b/coldfront/install.sh
@@ -7,7 +7,7 @@ log_info() {
   printf "\n\e[0;35m $1\e[0m\n\n"
 }
 
-TARGETARCH=${TARGETARCH:-amd64}
+ARCHTYPE=`uname -m`
 
 log_info "Installing required packages for coldfront.."
 dnf install -y \
diff --git a/ldap/Dockerfile b/ldap/Dockerfile
@@ -6,7 +6,5 @@ ARG TARGETARCH
 
 FROM stage-${TARGETARCH} as final
 
-ARG TARGETARCH
-
 COPY . /build
 RUN /build/install.sh && rm -rf /build
diff --git a/ldap/install.sh b/ldap/install.sh
@@ -7,7 +7,7 @@ log_info() {
   printf "\n\e[0;35m $1\e[0m\n\n"
 }
 
-TARGETARCH=${TARGETARCH:-amd64}
+ARCHTYPE=`uname -m`
 
 source /build/base.config
 
diff --git a/ondemand/Dockerfile b/ondemand/Dockerfile
@@ -8,8 +8,6 @@ ARG TARGETARCH
 
 FROM stage-${TARGETARCH} as final
 
-ARG TARGETARCH
-
 COPY . /build
 RUN /build/install.sh && rm -rf /build
 COPY cluster-config.yml /etc/ood/config/clusters.d/hpc.yml
diff --git a/ondemand/install.sh b/ondemand/install.sh
@@ -7,14 +7,74 @@ log_info() {
   printf "\n\e[0;35m $1\e[0m\n\n"
 }
 
-TARGETARCH=${TARGETARCH:-amd64}
+ARCHTYPE=`uname -m`
+DEX_VERSION=${DEX_VERSION:-2.31.1}
+DEX_PATCH_VERSION=${DEX_PATCH_VERSION:-703e26bc109e86d00be22ef1803bdb96b2dc09e2}
 
-log_info "Installing required packages for Ondemand.."
+log_info "Installing required packages for Ondemand ${ARCHTYPE}.."
 
-dnf install -y \
-    netcat \
-    ondemand \
-    ondemand-dex
+if [[ "${ARCHTYPE}" = "x86_64" ]]; then
+    dnf install -y https://yum.osc.edu/ondemand/2.0/ondemand-release-web-2.0-1.noarch.rpm
+    dnf install -y \
+        netcat \
+        ondemand \
+        ondemand-dex
+elif [[ "${ARCHTYPE}" = "aarch64" ]]; then
+    # TODO: flesh out arm64 builds?
+    dnf install -y golang-bin
+    log_info "Install dex ${DEX_VERSION}..."
+    wget -O /tmp/dex-${DEX_VERSION}.tar.gz https://github.com/dexidp/dex/archive/v${DEX_VERSION}.tar.gz
+    wget -O /tmp/dex-ood.patch https://github.com/OSC/dex/commit/${DEX_PATCH_VERSION}.patch
+    pushd /tmp
+    tar xvf dex-${DEX_VERSION}.tar.gz
+    pushd dex-${DEX_VERSION}
+    make build
+    mv bin/dex bin/dex-orig
+    patch -p1 < ../dex-ood.patch
+    make build
+    mv bin/dex /usr/sbin/ondemand-dex-session
+    mv bin/dex-orig /usr/sbin/ondemand-dex
+    popd
+    rm -rf /tmp/dex*
+    mkdir -p /usr/share/ondemand-dex/
+    git clone https://github.com/OSC/ondemand-dex.git
+    pushd ondemand-dex
+    mv web /usr/share/ondemand-dex/
+    popd
+    rm -Rf ondemand-dex
+    groupadd -r ondemand-dex
+    useradd -r -d /var/lib/ondemand-dex -g ondemand-dex -s /sbin/nologin -c "OnDemand Dex" ondemand-dex
+    mkdir -p /etc/ood/dex
+    tee /etc/ood/dex/config.yaml <<EOF
+---
+issuer: http://eb8307ff82be:5556
+storage:
+  type: sqlite3
+  config:
+    file: "/etc/ood/dex/dex.db"
+web:
+  http: 0.0.0.0:5556
+telemetry:
+  http: 0.0.0.0:5558
+staticClients:
+- id: eb8307ff82be
+  redirectURIs:
+  - http://eb8307ff82be/oidc
+  name: OnDemand
+  secret: 7c6c2f51-2f97-4866-886e-2fcf5b974224
+oauth2:
+  skipApprovalScreen: true
+enablePasswordDB: true
+staticPasswords:
+- email: ood@localhost
+  hash: "$2a$10$2b2cU8CPhOTaGrs1HRQuAueS7JTT5ZHsHSzYiFPm1leZck7Mc8T4W"
+  username: ood
+  userID: '08a8684b-db88-4b73-90a9-3cd1661f5466'
+frontend:
+  dir: "/usr/share/ondemand-dex/web"
+  theme: hpc-coop
+EOF
+fi
 
 log_info "Setting up Ondemand"
 mkdir -p /etc/ood/config/clusters.d
@@ -81,15 +141,17 @@ dex:
     theme: ondemand
 EOF
 
-log_info "Generating new httpd24 and dex configs.."
-/opt/ood/ood-portal-generator/sbin/update_ood_portal
+if [[ ${ARCHTYPE} = "x86_64" ]]; then
+    log_info "Generating new httpd24 and dex configs.."
+    /opt/ood/ood-portal-generator/sbin/update_ood_portal
+
+    log_info "Adding new theme to dex"
+    sed -i "s/theme: ondemand/theme: hpc-coop/g" /etc/ood/dex/config.yaml
+fi
 
 dnf clean all
 rm -rf /var/cache/dnf
 
-log_info "Adding new theme to dex"
-sed -i "s/theme: ondemand/theme: hpc-coop/g" /etc/ood/dex/config.yaml
-
 log_info "Cloning repos to assist with app development.."
 mkdir -p /var/git
 git clone https://github.com/OSC/bc_example_jupyter.git --bare /var/git/bc_example_jupyter
diff --git a/slurm/Dockerfile b/slurm/Dockerfile
@@ -9,7 +9,6 @@ ARG TARGETARCH
 FROM stage-${TARGETARCH} as final
 
 ARG SLURM_VERSION
-ARG TARGETARCH
 COPY . /build
 RUN /build/install.sh && rm -rf /build
 COPY slurm.conf /etc/slurm/slurm.conf
diff --git a/slurm/install.sh b/slurm/install.sh
@@ -9,7 +9,7 @@ log_info() {
 
 SLURM_VERSION=${SLURM_VERSION:-21.08.8-2}
 WEBSOCKIFY_VERSION=${WEBSOCKIFY_VERSION:-0.8.0}
-TARGETARCH=${TARGETARCH:-amd64}
+ARCHTYPE=`uname -m`
 
 log_info "Installing required packages for building slurm.."
 curl -o /etc/yum.repos.d/turbovnc.repo https://turbovnc.org/pmwiki/uploads/Downloads/TurboVNC.repo
diff --git a/xdmod/Dockerfile b/xdmod/Dockerfile
@@ -8,8 +8,6 @@ ARG TARGETARCH
 
 FROM stage-${TARGETARCH} as final
 
-ARG TARGETARCH
-
 COPY . /build
 RUN /build/install.sh && rm -rf /build
 COPY conf/httpd.conf /etc/httpd/conf.d/xdmod.conf
diff --git a/xdmod/install.sh b/xdmod/install.sh
@@ -9,7 +9,7 @@ log_info() {
 
 log_info "Installing required packages for xdmod.."
 
-TARGETARCH=${TARGETARCH:-amd64}
+ARCHTYPE=`uname -m`
 
 #------------------------
 # For the purpose of the tutorial we install some extra packages that
@@ -37,8 +37,7 @@ pip2 install pexpect==4.4.0
 # be installed in the same container.  In a production deployment they may be installed
 # on separate hosts.
 #------------------------
-dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.0/xdmod-10.0.0-1.0.beta1.el8.noarch.rpm \
-               https://github.com/ubccr/xdmod-supremm/releases/download/v10.0.0/xdmod-supremm-10.0.0-1.0.beta1.el8.noarch.rpm
+dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.0/xdmod-10.0.0-1.0.beta1.el8.noarch.rpm
 
 #------------------------
 # The Job Performance software uses MongoDB to store the job-level performance
@@ -48,9 +47,10 @@ dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.0/xdmod-10
 #------------------------
 
 dnf install -y \
-    https://repo.mongodb.org/yum/redhat/8/mongodb-org/3.6/x86_64/RPMS/mongodb-org-shell-3.6.23-1.el8.x86_64.rpm
+    https://repo.mongodb.org/yum/redhat/8/mongodb-org/5.0/${ARCHTYPE}/RPMS/mongodb-org-shell-5.0.9-1.el8.${ARCHTYPE}.rpm
 
-pip install pymongo==3.12.3 --upgrade
+pip3 install pymongo --upgrade
+pip2 install pymongo --upgrade
 
 #------------------------
 # O/S package configuration.

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ log_info() {`
`7`	`7`	`printf "\n\e[0;35m $1\e[0m\n\n"`
`8`	`8`	`}`
`9`	`9`
`10`		`-TARGETARCH=${TARGETARCH:-amd64}`
	`10`	+ARCHTYPE=`uname -m`
`11`	`11`
`12`	`12`	`log_info "Installing required packages for coldfront.."`
`13`	`13`	`dnf install -y \`