Skip to content

Commit

Permalink
Merge pull request #3 from VariantSync/fix-windows-line-endings
Browse files Browse the repository at this point in the history
Fix windows line endings
  • Loading branch information
pmbittner authored Jun 14, 2024
2 parents e3bc8f2 + 9a9dcfe commit 16516f1
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 7 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND=noninteractive
# Update the package list and upgrade the system without any prompts
RUN apt-get update && apt-get upgrade -y

RUN apt-get install bash git python3 unzip curl -y
RUN apt-get install bash git python3 unzip curl dos2unix -y

# Install Python and pip

Expand All @@ -48,6 +48,9 @@ RUN mkdir data
COPY data ./data
COPY setup.sh ./setup.sh

# Patch Windows line endings if the repository was cloned on Windows.
RUN find . -exec dos2unix {} +

# Copy all relevant files from the previous stage
COPY --from=0 /home/user/target* ./

Expand Down
3 changes: 2 additions & 1 deletion build-on-mac.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /bin/bash
#!/usr/bin/env bash

USER_ID=$(id -u ${SUDO_USER:-$(whoami)})
GROUP_ID=$(id -g ${SUDO_USER:-$(whoami)})
PLATFORM=linux/arm64/v8
Expand Down
3 changes: 2 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /bin/bash
#!/usr/bin/env bash

USER_ID=$(id -u ${SUDO_USER:-$(whoami)})
GROUP_ID=$(id -g ${SUDO_USER:-$(whoami)})

Expand Down
3 changes: 2 additions & 1 deletion clean.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /bin/bash
#!/usr/bin/env bash

echo "Cleaning all related Docker data. This may take a moment..."
echo "Trying to stop running containers..."
docker stop "$(docker ps -a -q --filter "ancestor=boosting")"
Expand Down
3 changes: 2 additions & 1 deletion execute.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /bin/bash
#!/usr/bin/env bash

echo "Starting $1"
docker run --rm -v "$(pwd)/results":"/home/user/results" boosting "$@"

Expand Down
2 changes: 1 addition & 1 deletion setup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

# Download the ground-truth.zip file
curl -o data/ground-truth.zip https://zenodo.org/records/11472597/files/ground-truth.zip?download=1
Expand Down
3 changes: 2 additions & 1 deletion stop-execution.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#! /bin/bash
#!/usr/bin/env bash

echo "Stopping Docker container. This will take a moment..."
docker stop "$(docker ps -a -q --filter "ancestor=boosting")"
echo "...done."

0 comments on commit 16516f1

Please sign in to comment.