Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test arm builds for current builds #7

Merged
merged 10 commits into from
Dec 16, 2023
+29 −9
Merged

test arm builds for current builds #7

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8b57438
test arm builds for current builds
vsoch Dec 14, 2023
cca4785
add arch build arg to container
vsoch Dec 14, 2023
afb358c
add arch build arg to container
vsoch Dec 14, 2023
1f12821
add arch build arg to container
vsoch Dec 14, 2023
08d2886
add arch build arg to container
vsoch Dec 14, 2023
79354f4
add arch build arg to container
vsoch Dec 14, 2023
97ece42
add arch build arg to container
vsoch Dec 14, 2023
79a72d3
try aarch64 instead of arm
vsoch Dec 15, 2023
3fa0981
remove curl
vsoch Dec 15, 2023
7120060
remove arm
vsoch Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add arch build arg to container 
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
@vsoch
vsoch committed Dec 14, 2023
commit 79354f4be5df2d019ee15b7b04cf6d8ec64d75ac
5 changes: 3 additions & 2 deletions rocky/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ FROM spack/rockylinux${tag}:latest as builder
ARG ARCH=x86_64
ENV ARCH=${ARCH}

RUN dnf update -y && dnf install -y gettext
RUN dnf update -y && dnf install -y gettext curl

# Specify flux deps in the spack manifest file (spack.yaml)
RUN mkdir /opt/spack-environment \
@@ -16,7 +16,7 @@ RUN mkdir /opt/spack-environment \
&& echo ' all:' \
&& echo ' require: ["target=:${ARCH}"]' \
&& echo ' config:' \
&& echo ' install_tree: /opt/software') > /opt/spack-environment/spack.yaml
&& echo ' install_tree: /opt/software') > /opt/spack-environment/spack-template.yaml

RUN envsubst < /opt/spack-environment/spack-template.yaml > /opt/spack-environment/spack.yaml && \
cat /opt/spack-environment/spack.yaml
@@ -25,6 +25,7 @@ RUN envsubst < /opt/spack-environment/spack-template.yaml > /opt/spack-environme
RUN cd /opt/spack-environment && \
. /opt/spack/share/spack/setup-env.sh && \
spack env activate . && \
spack external find curl && \
spack install --fail-fast && spack gc -y

# Strip all the binaries
4 changes: 2 additions & 2 deletions ubuntu/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ FROM spack/ubuntu-${tag}:latest as builder
ARG ARCH=x86_64
ENV ARCH=${ARCH}

RUN apt-get update && apt-get install gettext-base
RUN apt-get update && apt-get install gettext-base curl

# What we want to install and how we want to install it
# is specified in a manifest file (spack.yaml)
@@ -26,9 +26,9 @@ RUN envsubst < /opt/spack-environment/spack-template.yaml > /opt/spack-environme
RUN cd /opt/spack-environment && \
. /opt/spack/share/spack/setup-env.sh && \
spack env activate . && \
spack external find curl && \
spack install --fail-fast && spack gc -y


# Strip all the binaries
RUN find -L /opt/views/view/* -type f -exec readlink -f '{}' \; | \
xargs file -i | \