Skip to content

Commit 2def585

Browse files
authored
Merge pull request #181 from MaRDI4NFDI/T372458
Apply fix for T372458
2 parents 297af6a + b64a1a0 commit 2def585

File tree

2 files changed

+31
-0
lines changed

2 files changed

+31
-0
lines changed

Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ RUN apt-get update && \
212212
DEBIAN_FRONTEND=noninteractive \
213213
apt-get install --yes --no-install-recommends \
214214
zlib1g-dev libjpeg-dev libpng-dev libfreetype6-dev libzip-dev zip && \
215+
patch && \
215216
apt-get clean && \
216217
rm -rf /var/lib/apt/lists/*
217218

@@ -226,6 +227,15 @@ COPY --from=collector /var/www/html /var/www/html
226227
WORKDIR /var/www/html/
227228
COPY composer.local.json /var/www/html/composer.local.json
228229

230+
# cf. https://github.com/wmde/wikibase-release-pipeline/pull/753/files
231+
# WORKAROUND for https://phabricator.wikimedia.org/T372458
232+
# Take wikibase submodules from github as phabricator rate limits us
233+
COPY --chown=nobody:nogroup --chmod=755 \
234+
wikibase-submodules-from-github-instead-of-phabricator.patch \
235+
/tmp/wikibase-submodules-from-github-instead-of-phabricator.patch
236+
RUN patch -d /var/www/html/extensions/Wikibase -Np1 </tmp/wikibase-submodules-from-github-instead-of-phabricator.patch && \
237+
rm /tmp/wikibase-submodules-from-github-instead-of-phabricator.patch
238+
229239
COPY --from=composer /usr/bin/composer /usr/bin/composer
230240
ENV COMPOSER_ALLOW_SUPERUSER=1
231241
RUN composer install --no-dev
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
diff --git a/.gitmodules b/.gitmodules
2+
index df41c768af..e9926d6ddd 100644
3+
--- a/.gitmodules
4+
+++ b/.gitmodules
5+
@@ -3,13 +3,13 @@
6+
url = https://gerrit.wikimedia.org/r/data-values/value-view
7+
[submodule "view/lib/wikibase-serialization"]
8+
path = view/lib/wikibase-serialization
9+
- url = https://phabricator.wikimedia.org/source/wikibase-serialization.git
10+
+ url = https://github.com/wmde/WikibaseSerializationJavaScript.git
11+
[submodule "view/lib/wikibase-data-values"]
12+
path = view/lib/wikibase-data-values
13+
- url = https://phabricator.wikimedia.org/source/datavalues-javascript.git
14+
+ url = https://github.com/wmde/DataValuesJavaScript.git
15+
[submodule "view/lib/wikibase-data-model"]
16+
path = view/lib/wikibase-data-model
17+
- url = https://phabricator.wikimedia.org/source/wikibase-data-model.git
18+
+ url = https://github.com/wmde/WikibaseDataModelJavaScript.git
19+
[submodule "view/lib/wikibase-termbox"]
20+
path = view/lib/wikibase-termbox
21+
url = https://gerrit.wikimedia.org/r/wikibase/termbox

0 commit comments

Comments
 (0)