Skip to content

Commit ac7cec1

Browse files
committed
Hadolint fixing (ciFixes) (wmde#47)
* Travis CI pin hadolint versoin Fix: Travis CI for wikibase-docker is blocked by hadolint Linting failure https://phabricator.wikimedia.org/T201995 * Update run-linters.sh * Update run-linters.sh * Fix hadolint pull * Also run with hadolint/hadolint:v1.3.0 * # hadolint ignore=DL3009 * # hadolint ignore=DL3009 * # hadolint ignore=DL3009 * # hadolint ignore=DL3009 * # hadolint ignore=DL3009 * # hadolint ignore=DL3009 * # hadolint ignore=DL3009 * # hadolint ignore=DL3009 * Try single line for hadolint ignore * Give in to hadolint for fetcher build step
1 parent 7f5d7f8 commit ac7cec1

File tree

11 files changed

+33
-18
lines changed

11 files changed

+33
-18
lines changed

.travis.yml

+6
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,14 @@ jobs:
2121
include:
2222
- stage: prebuild
2323
script: bash ./.travis/checkx.sh
24+
env:
25+
- SCRIPT=checkx
26+
- IMAGE_PATH=all
2427
- stage: prebuild
2528
script: bash ./.travis/run-linters.sh
29+
env:
30+
- SCRIPT=hadolint
31+
- IMAGE_PATH=all
2632

2733
stages:
2834
- prebuild

.travis/run-docker-linter.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
set -eu
33

44
echo "now linting: $1"
5-
docker run --rm -i hadolint/hadolint hadolint --ignore DL3006 - < "$1"
6-
echo "-------"
5+
docker run --rm -i hadolint/hadolint:v1.3.0 hadolint --ignore DL3006 - < "$1"
6+
echo "-------"

.travis/run-linters.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
docker pull hadolint/hadolint
3+
docker pull hadolint/hadolint:v1.3.0
44

55
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
66

quickstatements/latest/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ubuntu:xenial as fetcher
22

33
RUN apt-get update && \
4-
apt-get install --yes --no-install-recommends git=1:2.* ca-certificates=201*
4+
apt-get install --yes --no-install-recommends git=1:2.* ca-certificates=201* && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
56

67
RUN git clone --depth 1 https://phabricator.wikimedia.org/source/tool-quickstatements.git quickstatements
78
RUN git clone --depth 1 https://bitbucket.org/magnusmanske/magnustools.git magnustools
@@ -43,4 +44,4 @@ ENV MW_SITE_NAME=wikibase-docker\
4344
RUN install -d -owww-data /var/log/quickstatements
4445

4546
ENTRYPOINT ["/bin/bash"]
46-
CMD ["/entrypoint.sh"]
47+
CMD ["/entrypoint.sh"]

wdqs-frontend/latest/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ubuntu:xenial as fetcher
22

33
RUN apt-get update && \
4-
apt-get install --yes --no-install-recommends unzip=6.*
4+
apt-get install --yes --no-install-recommends unzip=6.* && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
56

67
ADD https://github.com/wikimedia/wikidata-query-gui/archive/master.zip ./master.zip
78

@@ -36,4 +37,4 @@ ENV LANGUAGE=en\
3637
BRAND_TITLE=DockerWikibaseQueryService
3738

3839
ENTRYPOINT ["/entrypoint.sh"]
39-
CMD ["nginx", "-g", "daemon off;"]
40+
CMD ["nginx", "-g", "daemon off;"]

wdqs/0.2.5/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ubuntu:xenial as fetcher
22

33
RUN apt-get update && \
4-
apt-get install --yes --no-install-recommends unzip=6.*
4+
apt-get install --yes --no-install-recommends unzip=6.* && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
56

67
ADD https://archiva.wikimedia.org/repository/snapshots/org/wikidata/query/rdf/service/0.2.5-SNAPSHOT/service-0.2.5-SNAPSHOT-dist.zip ./service-dist.zip
78

@@ -37,4 +38,4 @@ COPY whitelist.txt /wdqs/whitelist.txt
3738
# TODO is this actually needed?
3839
RUN chmod +x /wdqs/runUpdate.sh
3940

40-
ENTRYPOINT ["/entrypoint.sh"]
41+
ENTRYPOINT ["/entrypoint.sh"]

wdqs/0.3.0/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ubuntu:xenial as fetcher
22

33
RUN apt-get update && \
4-
apt-get install --yes --no-install-recommends unzip=6.*
4+
apt-get install --yes --no-install-recommends unzip=6.* && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
56

67
ADD https://archiva.wikimedia.org/repository/snapshots/org/wikidata/query/rdf/service/0.3.0-SNAPSHOT/service-0.3.0-SNAPSHOT-dist.zip ./service-dist.zip
78

@@ -38,4 +39,4 @@ COPY whitelist.txt /wdqs/whitelist.txt
3839
# TODO is this actually needed?
3940
RUN chmod +x /wdqs/runUpdate.sh
4041

41-
ENTRYPOINT ["/entrypoint.sh"]
42+
ENTRYPOINT ["/entrypoint.sh"]

wdqs/0.3.1/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ubuntu:xenial as fetcher
22

33
RUN apt-get update && \
4-
apt-get install --yes --no-install-recommends unzip=6.*
4+
apt-get install --yes --no-install-recommends unzip=6.* && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
56

67
ADD https://archiva.wikimedia.org/repository/snapshots/org/wikidata/query/rdf/service/0.3.1-SNAPSHOT/service-0.3.1-SNAPSHOT-dist.zip ./service-dist.zip
78

@@ -38,4 +39,4 @@ COPY whitelist.txt /wdqs/whitelist.txt
3839
# TODO is this actually needed?
3940
RUN chmod +x /wdqs/runUpdate.sh
4041

41-
ENTRYPOINT ["/entrypoint.sh"]
42+
ENTRYPOINT ["/entrypoint.sh"]

wikibase/1.29/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ubuntu:xenial as fetcher
22

33
RUN apt-get update && \
4-
apt-get install --yes --no-install-recommends unzip=6.*
4+
apt-get install --yes --no-install-recommends unzip=6.* && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
56

67
ADD https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/REL1_29.zip .
78

@@ -41,4 +42,4 @@ ENV MW_SITE_NAME=wikibase-docker\
4142

4243

4344
ENTRYPOINT ["/bin/sh"]
44-
CMD ["/entrypoint.sh"]
45+
CMD ["/entrypoint.sh"]

wikibase/1.30/base/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
FROM ubuntu:xenial as fetcher
22

33
RUN apt-get update && \
4-
apt-get install --yes --no-install-recommends unzip=6.*
4+
apt-get install --yes --no-install-recommends unzip=6.* && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
56

67
ADD https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/REL1_30.zip .
78

@@ -40,4 +41,4 @@ ENV MW_SITE_NAME=wikibase-docker\
4041
MW_SITE_LANG=en
4142

4243
ENTRYPOINT ["/bin/bash"]
43-
CMD ["/entrypoint.sh"]
44+
CMD ["/entrypoint.sh"]

wikibase/1.30/bundle/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
FROM ubuntu:xenial as fetcher
22

33
RUN apt-get update && \
4-
apt-get install --yes --no-install-recommends unzip=6.* jq=1.* curl=7.* ca-certificates=201*
4+
apt-get install --yes --no-install-recommends unzip=6.* jq=1.* curl=7.* ca-certificates=201* && \
5+
apt-get clean && rm -rf /var/lib/apt/lists/*
6+
57
COPY download-extension.sh .
68
ADD https://github.com/filbertkm/WikibaseImport/archive/master.tar.gz /WikibaseImport.tar.gz
79
RUN bash download-extension.sh OAuth;\

0 commit comments

Comments
 (0)