Skip to content

Commit 8330af2

Browse files
committed
Find minimal example to reproduce composer problem
With this setup run the update and see the duplicate import problem cf. wikimedia/composer-merge-plugin#251
1 parent bf1e4ba commit 8330af2

File tree

2 files changed

+4
-67
lines changed

2 files changed

+4
-67
lines changed

Dockerfile

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -93,54 +93,6 @@ FROM mediawiki:${MEDIAWIKI_VERSION} as collector
9393
RUN rm -rf /var/www/html/*
9494

9595
COPY --from=fetcher /mediawiki /var/www/html
96-
# collect bundle extensions
97-
COPY --from=fetcher /Elastica /var/www/html/extensions/Elastica
98-
COPY --from=fetcher /OAuth /var/www/html/extensions/OAuth
99-
COPY --from=fetcher /CirrusSearch /var/www/html/extensions/CirrusSearch
100-
COPY --from=fetcher /WikibaseCirrusSearch /var/www/html/extensions/WikibaseCirrusSearch
101-
COPY --from=fetcher /UniversalLanguageSelector /var/www/html/extensions/UniversalLanguageSelector
102-
COPY --from=fetcher /cldr /var/www/html/extensions/cldr
103-
COPY --from=fetcher /EntitySchema /var/www/html/extensions/EntitySchema
104-
COPY --from=fetcher /Flow /var/www/html/extensions/Flow
105-
COPY --from=fetcher /Babel /var/www/html/extensions/Babel
106-
COPY --from=fetcher /ConfirmEdit /var/www/html/extensions/ConfirmEdit
107-
COPY --from=fetcher /Scribunto /var/www/html/extensions/Scribunto
108-
COPY --from=fetcher /VisualEditor /var/www/html/extensions/VisualEditor
109-
COPY --from=fetcher /WikibaseManifest /var/www/html/extensions/WikibaseManifest
110-
COPY --from=fetcher /WikibaseLexeme /var/www/html/extensions/WikibaseLexeme
111-
COPY --from=fetcher /WikibaseLocalMedia /var/www/html/extensions/WikibaseLocalMedia
112-
COPY --from=fetcher /WikibaseExport /var/www/html/extensions/WikibaseExport
113-
COPY --from=fetcher /Wikibase /var/www/html/extensions/Wikibase
114-
115-
# collect MaRDI extensions
116-
COPY --from=fetcher /Math /var/www/html/extensions/Math
117-
COPY --from=fetcher /MathSearch /var/www/html/extensions/MathSearch
118-
COPY --from=fetcher /TemplateStyles /var/www/html/extensions/TemplateStyles
119-
COPY --from=fetcher /JsonConfig /var/www/html/extensions/JsonConfig
120-
COPY --from=fetcher /Lockdown /var/www/html/extensions/Lockdown
121-
COPY --from=fetcher /Nuke /var/www/html/extensions/Nuke
122-
COPY --from=fetcher /YouTube /var/www/html/extensions/YouTube
123-
COPY --from=fetcher /ExternalContent /var/www/html/extensions/ExternalContent
124-
# COPY --from=fetcher /Shibboleth /var/www/html/extensions/Shibboleth
125-
COPY --from=fetcher /PluggableAuth /var/www/html/extensions/PluggableAuth
126-
COPY --from=fetcher /OpenIDConnect /var/www/html/extensions/OpenIDConnect
127-
COPY --from=fetcher /MatomoAnalytics /var/www/html/extensions/MatomoAnalytics
128-
COPY --from=fetcher /Graph /var/www/html/extensions/Graph
129-
COPY --from=fetcher /ArticlePlaceholder /var/www/html/extensions/ArticlePlaceholder
130-
COPY --from=fetcher /Thanks /var/www/html/extensions/Thanks
131-
COPY --from=fetcher /Echo /var/www/html/extensions/Echo
132-
COPY --from=fetcher /LinkedWiki /var/www/html/extensions/LinkedWiki
133-
#swmath
134-
COPY --from=fetcher /ExternalData /var/www/html/extensions/ExternalData
135-
COPY --from=fetcher /UrlGetParameters /var/www/html/extensions/UrlGetParameters
136-
137-
# extensions used in wmflabs
138-
# lct.wmflabs.org
139-
COPY --from=fetcher /Popups /var/www/html/extensions/Popups
140-
# drmf-beta.wmflabs.org
141-
COPY --from=fetcher /DataTransfer /var/www/html/extensions/DataTransfer
142-
# wiki.physikerwelt.de
143-
COPY --from=fetcher /SemanticDrilldown /var/www/html/extensions/SemanticDrilldown
14496

14597
# collect Vector Skin
14698
COPY --from=fetcher /Vector /var/www/html/skins/Vector
@@ -154,9 +106,6 @@ COPY --from=collector /var/www/html /var/www/html
154106
WORKDIR /var/www/html/
155107
COPY composer.local.json /var/www/html/composer.local.json
156108

157-
# Temporary fix to allow ExternalData installation with composer < 2
158-
RUN sed -i '/"composer\/installers": "~2\.1"/d' /var/www/html/extensions/ExternalData/composer.json
159-
160109
RUN apt-get update && \
161110
DEBIAN_FRONTEND=noninteractive \
162111
apt-get install --yes --no-install-recommends \
@@ -221,20 +170,6 @@ RUN echo "* */1 * * * root /var/www/html/regular_maintenance.sh > /var/ww
221170
# Set ownership of the uploaded images directory
222171
RUN chown www-data:www-data /var/www/html/images
223172

224-
# Copy shibboleth apache config
225-
# COPY shib_mod.conf /etc/apache2/conf-available
226-
# COPY shibboleth2.xml /etc/shibboleth/shibboleth2.xml
227-
#Test creating default location for shibboleth socket file
228-
# RUN mkdir /var/run/shibboleth
229-
# Enable mod shibboleth and generate self signed keys
230-
# RUN shib-keygen && a2enconf shib_mod
231-
232-
# Set up vecollabpad
233-
RUN cd /var/www/html/extensions/VisualEditor/lib/ve && npm install && grunt build
234-
RUN cd /var/www/html/extensions/VisualEditor/lib/ve/rebaser && npm install && cp config.dev.yaml config.yaml && sed -i 's/localhost/mongodb/g' config.yaml
235-
236-
# Install node modules for LinkedWiki
237-
RUN cd /var/www/html/extensions/LinkedWiki && npm install
238173

239174
##
240175
ENTRYPOINT ["/bin/bash"]

composer.local.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
{
2+
"require": {
3+
"mediawiki/semantic-media-wiki": "~4.1"
4+
},
25
"extra": {
36
"merge-plugin": {
47
"include": [
5-
"extensions/*/composer.json",
6-
"skins/*/composer.json"
8+
"extensions/*/composer.json"
79
]
810
}
911
}

0 commit comments

Comments
 (0)