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

Author: addshore

.travis.yml

@@ -21,8 +21,14 @@ jobs:
   include:
     - stage: prebuild
       script: bash ./.travis/checkx.sh
+      env:
+       - SCRIPT=checkx
+       - IMAGE_PATH=all
     - stage: prebuild
       script: bash ./.travis/run-linters.sh
+      env:
+       - SCRIPT=hadolint
+       - IMAGE_PATH=all
 
 stages:
   - prebuild

.travis/run-docker-linter.sh

@@ -2,5 +2,5 @@
 set -eu
 
 echo "now linting: $1"
-docker run --rm -i hadolint/hadolint hadolint --ignore DL3006 - < "$1"
-echo "-------"
+docker run --rm -i hadolint/hadolint:v1.3.0 hadolint --ignore DL3006 - < "$1"
+echo "-------"

.travis/run-linters.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-docker pull hadolint/hadolint
+docker pull hadolint/hadolint:v1.3.0
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

quickstatements/latest/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:xenial as fetcher
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends git=1:2.* ca-certificates=201*
+    apt-get install --yes --no-install-recommends git=1:2.* ca-certificates=201* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN git clone --depth 1 https://phabricator.wikimedia.org/source/tool-quickstatements.git quickstatements
 RUN git clone --depth 1 https://bitbucket.org/magnusmanske/magnustools.git magnustools
@@ -43,4 +44,4 @@ ENV MW_SITE_NAME=wikibase-docker\
 RUN install -d -owww-data /var/log/quickstatements
 
 ENTRYPOINT ["/bin/bash"]
-CMD ["/entrypoint.sh"]
+CMD ["/entrypoint.sh"]

wdqs-frontend/latest/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:xenial as fetcher
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends unzip=6.*
+    apt-get install --yes --no-install-recommends unzip=6.* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ADD https://github.com/wikimedia/wikidata-query-gui/archive/master.zip ./master.zip
 
@@ -36,4 +37,4 @@ ENV LANGUAGE=en\
     BRAND_TITLE=DockerWikibaseQueryService
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]

wdqs/0.2.5/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:xenial as fetcher
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends unzip=6.*
+    apt-get install --yes --no-install-recommends unzip=6.* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 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
 
@@ -37,4 +38,4 @@ COPY whitelist.txt /wdqs/whitelist.txt
 # TODO is this actually needed?
 RUN chmod +x /wdqs/runUpdate.sh
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

wdqs/0.3.0/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:xenial as fetcher
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends unzip=6.*
+    apt-get install --yes --no-install-recommends unzip=6.* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 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
 
@@ -38,4 +39,4 @@ COPY whitelist.txt /wdqs/whitelist.txt
 # TODO is this actually needed?
 RUN chmod +x /wdqs/runUpdate.sh
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

wdqs/0.3.1/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:xenial as fetcher
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends unzip=6.*
+    apt-get install --yes --no-install-recommends unzip=6.* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 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
 
@@ -38,4 +39,4 @@ COPY whitelist.txt /wdqs/whitelist.txt
 # TODO is this actually needed?
 RUN chmod +x /wdqs/runUpdate.sh
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

wikibase/1.29/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:xenial as fetcher
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends unzip=6.*
+    apt-get install --yes --no-install-recommends unzip=6.* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ADD https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/REL1_29.zip .
 
@@ -41,4 +42,4 @@ ENV MW_SITE_NAME=wikibase-docker\
 
 
 ENTRYPOINT ["/bin/sh"]
-CMD ["/entrypoint.sh"]
+CMD ["/entrypoint.sh"]

wikibase/1.30/base/Dockerfile

@@ -1,7 +1,8 @@
 FROM ubuntu:xenial as fetcher
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends unzip=6.*
+    apt-get install --yes --no-install-recommends unzip=6.* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ADD https://github.com/wikimedia/mediawiki-extensions-Wikibase/archive/REL1_30.zip .
 
@@ -40,4 +41,4 @@ ENV MW_SITE_NAME=wikibase-docker\
     MW_SITE_LANG=en
 
 ENTRYPOINT ["/bin/bash"]
-CMD ["/entrypoint.sh"]
+CMD ["/entrypoint.sh"]

wikibase/1.30/bundle/Dockerfile

@@ -1,7 +1,9 @@
 FROM ubuntu:xenial as fetcher
 
 RUN apt-get update && \
-    apt-get install --yes --no-install-recommends unzip=6.* jq=1.* curl=7.* ca-certificates=201*
+    apt-get install --yes --no-install-recommends unzip=6.* jq=1.* curl=7.* ca-certificates=201* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
 COPY download-extension.sh .
 ADD https://github.com/filbertkm/WikibaseImport/archive/master.tar.gz /WikibaseImport.tar.gz
 RUN bash download-extension.sh OAuth;\