Skip to content

Commit

Permalink
fix: variable assignment
Browse files Browse the repository at this point in the history
  • Loading branch information
FinnHering committed Oct 24, 2024
1 parent de41289 commit 2419012
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 3 deletions.
7 changes: 7 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "Julea Dev Container",
"image": "ghcr.io/finnhering/julea-dev-container:latest",
"containerEnv": {
"JULEA_SPACK_DIR": "/app/dependencies"
}
}.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ jobs:
tests:
name: Tests
needs: dependencies
runs-on: ${{ matrix.os.dist }}
runs-on: ubuntu-latest
container: docker pull ghcr.io/finnhering/julea-prebuilt:ubuntu-spack-gcc-24.04
timeout-minutes: 60
strategy:
fail-fast: false
Expand Down
Empty file added =
Empty file.
2 changes: 1 addition & 1 deletion Dockerfile.spack
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ COPY ./scripts/ /app/scripts/
RUN JULEA_SPACK_COMPILER=${JULEA_SPACK_COMPILER} JULEA_SPACK_DIR="/app/dependencies" /app/scripts/install-dependencies.sh


FROM base AS julea
FROM --platform=$TARGETPLATFORM base AS julea
WORKDIR /app

COPY ./ /app/
Expand Down
11 changes: 11 additions & 0 deletions create_builder.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/bash

docker buildx rm local_remote_builder || echo ""



echo "creating..."

docker buildx create --name local_remote_builder --node local_remote_build --platform linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/mips64le,linux/mips64,linux/arm/v8,linux/arm/v7,linux/arm/v6 --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=10000000 --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=10000000

docker buildx create --name local_remote_builder --append --node intelarch --platform linux/amd64,linux/386 'ssh://finn@35.208.102.154' --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=10000000 --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=10000000
2 changes: 1 addition & 1 deletion scripts/spack
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ spack_install ()

# Respect Docker TARGETPLATFORM
docker_target="${BUILDARCH:-amd64}"
docker_target_arch=echo "${docker_target}" | cut -d '/' -f2
docker_target_arch=$(echo "${docker_target}" | cut -d '/' -f2)
target = "x86"

case "${docker_target_arch}" in
Expand Down

0 comments on commit 2419012

Please sign in to comment.