Skip to content

Commit

Permalink
Make the Dockefile architecture independent
Browse files Browse the repository at this point in the history
  • Loading branch information
@christopherwharrop-noaa
christopherwharrop-noaa committed Jun 13, 2024
1 parent c75695c commit 4910f1c
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 32 deletions.
21 changes: 11 additions & 10 deletions frontend/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,18 @@ RUN cd /tmp \
&& mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes -y" -i debian/control \
&& debuild -b -uc -us \
&& cd .. \
&& dpkg --install slurm-smd_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-client_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-dev_23.11.7-1_amd64.deb \
&& ARCH=$(dpkg --print-architecture) \
&& dpkg --install slurm-smd_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-client_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-dev_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-doc_23.11.7-1_all.deb \
&& dpkg --install slurm-smd-libnss-slurm_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpmi0_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpmi2-0_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libslurm-perl_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-sackd_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-sview_23.11.7-1_amd64.deb
&& dpkg --install slurm-smd-libnss-slurm_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpmi0_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpmi2-0_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libslurm-perl_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-sackd_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-sview_23.11.7-1_${ARCH}.deb

RUN useradd -m admin -s /usr/bin/bash -d /home/admin \
&& echo "admin:admin" | chpasswd \
Expand Down
23 changes: 12 additions & 11 deletions master/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,19 @@ RUN cd /tmp \
&& mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes -y" -i debian/control \
&& debuild -b -uc -us \
&& cd .. \
&& dpkg --install slurm-smd_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-client_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-slurmctld_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-dev_23.11.7-1_amd64.deb \
&& ARCH=$(dpkg --print-architecture) \
&& dpkg --install slurm-smd_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-client_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-slurmctld_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-dev_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-doc_23.11.7-1_all.deb \
&& dpkg --install slurm-smd-libnss-slurm_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpmi0_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpmi2-0_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libslurm-perl_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-sackd_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-sview_23.11.7-1_amd64.deb
&& dpkg --install slurm-smd-libnss-slurm_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpmi0_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpmi2-0_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libslurm-perl_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-sackd_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-sview_23.11.7-1_${ARCH}.deb

RUN useradd -m admin -s /usr/bin/bash -d /home/admin \
&& echo "admin:admin" | chpasswd \
Expand Down
23 changes: 12 additions & 11 deletions node/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,19 @@ RUN cd /tmp \
&& mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes -y" -i debian/control \
&& debuild -b -uc -us \
&& cd .. \
&& dpkg --install slurm-smd_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-client_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-slurmd_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-dev_23.11.7-1_amd64.deb \
&& ARCH=$(dpkg --print-architecture) \
&& dpkg --install slurm-smd_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-client_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-slurmd_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-dev_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-doc_23.11.7-1_all.deb \
&& dpkg --install slurm-smd-libnss-slurm_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpmi0_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libpmi2-0_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-libslurm-perl_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-sackd_23.11.7-1_amd64.deb \
&& dpkg --install slurm-smd-sview_23.11.7-1_amd64.deb
&& dpkg --install slurm-smd-libnss-slurm_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpam-slurm-adopt_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpmi0_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libpmi2-0_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-libslurm-perl_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-sackd_23.11.7-1_${ARCH}.deb \
&& dpkg --install slurm-smd-sview_23.11.7-1_${ARCH}.deb

RUN useradd -m admin -s /usr/bin/bash -d /home/admin \
&& echo "admin:admin" | chpasswd \
Expand Down

0 comments on commit 4910f1c

Please sign in to comment.