Revert "Move alpine version definition out to variable"

This reverts commit c787e4bdbd.

.travis.yml

@@ -15,7 +15,6 @@ addons:
 
 env:
   - MAILU_VERSION=${TRAVIS_BRANCH////-}
-  - ALPINE_VERSION=3.10
 
 language: python
 python:
@@ -27,7 +26,7 @@ install:
 
 before_script:
   - docker-compose -v
-  - docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=${ALPINE_VERSION}
+  - docker-compose -f tests/build.yml build
   - sudo -- sh -c 'mkdir -p /mailu && cp -r tests/certs /mailu && chmod 600 /mailu/certs/*'
 
 

core/admin/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip git bash \

core/dovecot/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip git bash \

core/nginx/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip git bash \

core/none/Dockerfile

@@ -1,6 +1,5 @@
 # This is an idle image to dynamically replace any component if disabled.
 
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 
 CMD sleep 1000000d

core/postfix/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip git bash \

docs/contributors/environment.rst

@@ -112,7 +112,7 @@ After cloning the git repository to your workstation, you can build the images:
 .. code-block:: bash
 
   cd Mailu
-  docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=3.10
+  docker-compose -f tests/build.yml build
 
 The ``build.yml`` file has two variables:
 
@@ -125,7 +125,7 @@ To re-build only specific containers at a later time.
 
 .. code-block:: bash
 
-  docker-compose -f tests/build.yml --build-arg ALPINE_VERSION=3.10 build admin webdav
+  docker-compose -f tests/build.yml build admin webdav
 
 If you have to push the images to Docker Hub for testing in Docker Swarm or a remote
 host, you have to define ``DOCKER_ORG`` (usually your Docker user-name) and login to
@@ -138,7 +138,7 @@ the hub.
   Password: Bar
   export DOCKER_ORG="Foo"
   export VERSION="feat-extra-app"
-  docker-compose -f tests/build.yml build --build-arg ALPINE_VERSION=3.10
+  docker-compose -f tests/build.yml build
   docker-compose -f tests/build.yml push
 
 Running containers

optional/clamav/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip bash \

optional/postgresql/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip bash \

optional/radicale/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk add --no-cache radicale@testing curl bash

services/fetchmail/Dockerfile

@@ -1,6 +1,5 @@
 # First stage: Build
-ARG ALPINE_VERSION
+FROM alpine:3.10 as builder
-FROM alpine:$ALPINE_VERSION as builder
 
 # build dependencies
 RUN apk add --no-cache curl tar xz autoconf git gettext build-base openssl openssl-dev
@@ -11,7 +10,7 @@ RUN cd fetchmail-7.0.0-alpha6 && \
     ./configure --with-ssl --prefix /usr/local --disable-nls && \
     make
 
-FROM alpine:$ALPINE_VERSION
+FROM alpine:3.10
 
 
 # python3 shared with most images

services/rspamd/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip git bash \

services/unbound/Dockerfile

@@ -1,5 +1,4 @@
-ARG ALPINE_VERSION
+FROM alpine:3.10
-FROM alpine:$ALPINE_VERSION
 # python3 shared with most images
 RUN apk add --no-cache \
     python3 py3-pip git bash \