Skip to content

Commit c948623

Browse files
tarrowaddshore
authored andcommitted
force pull and fix up versions
1 parent 3970378 commit c948623

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

wdqs-frontend/latest/.travis/build-deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#Oneline for full directory name see: https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
33
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
set -e
5-
docker build "$DIR/../" -t wikibase/wdqs-frontend:latest
5+
docker build --pull "$DIR/../" -t wikibase/wdqs-frontend:latest
66

77
if [ "$SHOULD_DOCKER_PUSH" = true ]; then
88
docker push wikibase/wdqs-frontend:latest

wdqs-frontend/latest/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ WORKDIR /tmp/wikidata-query-gui-master
1717

1818
# Put wdqs gui in the right place
1919
RUN set -x ; \
20-
apk --no-cache add --virtual build-dependencies ca-certificates=20161130-r1 git=2.11.3-r0 nodejs=6.9.5-r1 jq=1.5-r4 \
20+
apk --no-cache add --virtual build-dependencies ca-certificates=20171114-r0 git=2.15.0-r1 nodejs=8.9.3-r1 jq=1.5-r5 \
2121
&& mv package.json package.json.orig \
2222
&& jq 'delpaths([["devDependencies","karma-qunit"],["devDependencies","qunitjs"],["devDependencies","sinon"]])' \
2323
> package.json < package.json.orig \

wdqs-proxy/latest/.travis/build-deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#Oneline for full directory name see: https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
33
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
set -e
5-
docker build "$DIR/../" -t wikibase/wdqs-proxy:latest
5+
docker build --pull "$DIR/../" -t wikibase/wdqs-proxy:latest
66

77
if [ "$SHOULD_DOCKER_PUSH" = true ]; then
88
docker push wikibase/wdqs-proxy:latest

wdqs/0.2.5/.travis/build-deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#Oneline for full directory name see: https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
33
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
set -e
5-
docker build "$DIR/../" -t wikibase/wdqs:0.2.5
5+
docker build --pull "$DIR/../" -t wikibase/wdqs:0.2.5
66

77
if [ "$SHOULD_DOCKER_PUSH" = true ]; then
88
docker push wikibase/wdqs:0.2.5

wdqs/0.3.0/.travis/build-deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#Oneline for full directory name see: https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
33
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
set -e
5-
docker build "$DIR/../" -t wikibase/wdqs:0.3.0 -t wikibase/wdqs:latest
5+
docker build --pull "$DIR/../" -t wikibase/wdqs:0.3.0 -t wikibase/wdqs:latest
66

77
if [ "$SHOULD_DOCKER_PUSH" = true ]; then
88
docker push wikibase/wdqs:0.3.0

wikibase/1.29/.travis/build-deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#Oneline for full directory name see: https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
33
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
set -e
5-
docker build "$DIR/../" -t wikibase/wikibase:1.29 -t wikibase/wikibase:legacy
5+
docker build --pull "$DIR/../" -t wikibase/wikibase:1.29 -t wikibase/wikibase:legacy
66

77
if [ "$SHOULD_DOCKER_PUSH" = true ]; then
88
docker push wikibase/wikibase:1.29

wikibase/1.29/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM mediawiki:1.29
2121

2222
# Install envsubst
2323
RUN apt-get update && \
24-
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends gettext-base=0.19.3-2 && \
24+
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends gettext-base=0.19.8.1-2 && \
2525
rm -rf /var/lib/apt/lists/*
2626

2727
RUN a2enmod rewrite

wikibase/1.30/.travis/build-deploy.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#Oneline for full directory name see: https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
33
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44
set -e
5-
docker build "$DIR/../base" -t wikibase/wikibase:1.30 -t wikibase/wikibase:1.30-base -t wikibase/wikibase:latest -t wikibase/wikibase:latest-base
6-
docker build "$DIR/../bundle" -t wikibase/wikibase:1.30-bundle -t wikibase/wikibase:latest-bundle
5+
docker build --pull "$DIR/../base" -t wikibase/wikibase:1.30 -t wikibase/wikibase:1.30-base -t wikibase/wikibase:latest -t wikibase/wikibase:latest-base
6+
docker build --pull "$DIR/../bundle" -t wikibase/wikibase:1.30-bundle -t wikibase/wikibase:latest-bundle
77

88
if [ "$SHOULD_DOCKER_PUSH" = true ]; then
99
docker push wikibase/wikibase:1.30

wikibase/1.30/base/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM mediawiki:1.30
2121

2222
# Install envsubst
2323
RUN apt-get update && \
24-
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends gettext-base=0.19.3-2 && \
24+
DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends gettext-base=0.19.8.1-2 && \
2525
rm -rf /var/lib/apt/lists/*
2626

2727
RUN a2enmod rewrite

0 commit comments

Comments
 (0)