refines the way that git is handled inside the docker containers

decenomy · May 26, 2024 · 07584c8 · 07584c8
1 parent 4a56b4b
commit 07584c8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/contrib/docker/Dockerfile.dsw-linux-arm64-wallet b/contrib/docker/Dockerfile.dsw-linux-arm64-wallet
@@ -18,10 +18,11 @@ fi
 # Switch to the repository directory
 WORKDIR /$TICKER
 
-# Check out a specific version if needed
-RUN git stash && \
+# Check out the $TARGET
+RUN git stash --include-untracked && \
  git fetch --all && \
- (git checkout $TARGET || (git checkout -B $TARGET && git pull origin $TARGET))
+ (git checkout $TARGET || git checkout -B $TARGET) && \
+ (git reset --hard origin/$TARGET || git reset --hard $TARGET)
 
 # Run Git commands to extract the timestamps
 RUN git log -1 --format="%at" | xargs -I{} date -d @{} "+%Y-%m-%d %H:%M:%S" > /git_timestamp

diff --git a/contrib/docker/Dockerfile.dsw-linux-x64-wallet b/contrib/docker/Dockerfile.dsw-linux-x64-wallet
@@ -19,10 +19,11 @@ fi
 # Switch to the repository directory
 WORKDIR /$TICKER
 
-# Check out a specific version if needed
-RUN git stash && \
+# Check out the $TARGET
+RUN git stash --include-untracked && \
  git fetch --all && \
- (git checkout $TARGET || (git checkout -B $TARGET && git pull origin $TARGET))
+ (git checkout $TARGET || git checkout -B $TARGET) && \
+ (git reset --hard origin/$TARGET || git reset --hard $TARGET)
 
 # Run Git commands to extract the timestamps
 RUN git log -1 --format="%at" | xargs -I{} date -d @{} "+%Y-%m-%d %H:%M:%S" > /git_timestamp

diff --git a/contrib/docker/Dockerfile.dsw-macos-x64-wallet b/contrib/docker/Dockerfile.dsw-macos-x64-wallet
@@ -18,10 +18,11 @@ fi
 # Switch to the repository directory
 WORKDIR /$TICKER
 
-# Check out a specific version if needed
-RUN git stash && \
+# Check out the $TARGET
+RUN git stash --include-untracked && \
  git fetch --all && \
- (git checkout $TARGET || (git checkout -B $TARGET && git pull origin $TARGET))
+ (git checkout $TARGET || git checkout -B $TARGET) && \
+ (git reset --hard origin/$TARGET || git reset --hard $TARGET)
 
 RUN git log -1 --format="%at" | xargs -I{} date -d @{} "+%Y-%m-%d %H:%M:%S" > /git_timestamp
 RUN git log -1 --format="%at" | xargs -I{} date -d @{} "+%Y%m%d%H%M.%S" > /git_timestamp_touch

diff --git a/contrib/docker/Dockerfile.dsw-windows-x64-wallet b/contrib/docker/Dockerfile.dsw-windows-x64-wallet
@@ -18,10 +18,11 @@ fi
 # Switch to the repository directory
 WORKDIR /$TICKER
 
-# Check out a specific version if needed
-RUN git stash && \
+# Check out the $TARGET
+RUN git stash --include-untracked && \
  git fetch --all && \
- (git checkout $TARGET || (git checkout -B $TARGET && git pull origin $TARGET))
+ (git checkout $TARGET || git checkout -B $TARGET) && \
+ (git reset --hard origin/$TARGET || git reset --hard $TARGET)
 
 RUN git log -1 --format="%at" | xargs -I{} date -d @{} "+%Y-%m-%d %H:%M:%S" > /git_timestamp
 RUN git log -1 --format="%at" | xargs -I{} date -d @{} "+%Y%m%d%H%M.%S" > /git_timestamp_touch