Skip to content

Commit de5ceef

Browse files
committed
skip failed patches
must apply individually as it would seem :[
1 parent b395450 commit de5ceef

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ WORKDIR /gamja
88
# Apply patches
99
RUN mkdir /gamja-patches
1010
COPY gamja/patches/*.patch /gamja-patches
11-
ENV GIT_COMMITTER_NAME="ocfbot" GIT_COMMITTER_EMAIL="ocfbot@ocf.berkeley.edu"
12-
RUN bash -c "git am < /gamja-patches/*.patch"
11+
ENV GIT_COMMITTER_NAME="ocfbot" GIT_COMMITTER_EMAIL="ocfbot@berkeley.edu"
12+
RUN cd /gamja && ls /gamja-patches/*.patch | while read patch; do git am -3 "$patch" || git am --skip; done
1313

1414
RUN npm install --production
1515

0 commit comments

Comments
 (0)