Add ARG DSPACE_APP_VERSION; minor clean-up

dockerfiles/Dockerfile

@@ -2,14 +2,14 @@
 # Dockerfile to build LINDAT Dspace container images
 # Based on Ubuntu
 ##############################################################################
+ARG DSPACE_APP_VERSION
 ARG UBUNTU_VERSION=16.04
 
-FROM gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/dspace-app/2020.02.1:1.1-rc2 as dspace-app
+FROM gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/dspace-app/2020.02.1:$DSPACE_APP_VERSION as dspace-app
 
 FROM ubuntu:$UBUNTU_VERSION
 ARG UBUNTU_VERSION
 
-ARG LABEL_VCS_URL="https://gitlab.inf.unibz.it/commul/docker/clarin-dspace"
 LABEL author="Alexander König <Alexander.Koenig@eurac.edu>, \
 Egon W. Stemle <egon.stemle@eurac.edu>"
 LABEL maintainer="Egon W. Stemle <egon.stemle@eurac.edu>"

dockerfiles/Earthfile

 # Usage: earthly --push [--no-cache] +docker
+ARG DSPACE_APP_VERSION=1.1-rc4
 
 docker-from-docker:
-    FROM DOCKERFILE .
+    FROM DOCKERFILE --build-arg DSPACE_APP_VERSION=$DSPACE_APP_VERSION .
 
     ARG DOCKER_BASE_URL="gitlab.inf.unibz.it:4567"
     ARG EARTHLY_GIT_PROJECT_NAME  # https://docs.earthly.dev/earthfile/builtin-args
@@ -40,5 +41,5 @@ docker-from-docker:
 
 docker:
     BUILD ./nginx/+docker
-    BUILD ./postgres/+docker
-    BUILD +docker-from-docker
+    BUILD --build-arg DSPACE_APP_VERSION=$DSPACE_APP_VERSION ./postgres/+docker
+    BUILD --build-arg DSPACE_APP_VERSION=$DSPACE_APP_VERSION +docker-from-docker

dockerfiles/nginx/Dockerfile

@@ -2,8 +2,8 @@
 # Dockerfile to build nginx and shibboleth for LINDAT Dspace container
 # Based on Ubuntu
 ##############################################################################
-
 ARG UBUNTU_VERSION=16.04
+
 FROM ubuntu:$UBUNTU_VERSION
 ARG UBUNTU_VERSION
 

dockerfiles/nginx/Earthfile

-# THIS IS A GENERATED FILE! See Earthfile.d/ for details.
-#
 # Usage: earthly --push --no-cache +docker
 
 docker-precondition-spf:
@@ -21,8 +19,8 @@ docker-from-docker:
 
     ARG AUTHOR="Egon W. Stemle <egon.stemle@eurac.edu>"
     ARG MAINTAINER="Egon W. Stemle <egon.stemle@eurac.edu>"
-    LABEL author="$AUTHOR" \
-          maintainer="$MAINTAINER"
+    LABEL author="$AUTHOR"
+    LABEL maintainer="$MAINTAINER"
 
     # An updated VERSION ARG triggers an update of the texlive installation
     ARG EARTHLY_TARGET_TAG

dockerfiles/postgres/Dockerfile

@@ -2,29 +2,22 @@
 # Dockerfile to build postgres for LINDAT Dspace container
 # Based on Postgres
 ##############################################################################
+ARG DSPACE_APP_VERSION
 ARG POSTGRES_VERSION=9.6
 
-FROM gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/dspace-app/2020.02.1:1.1-rc2 as dspace-app
+FROM gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/dspace-app/2020.02.1:$DSPACE_APP_VERSION as dspace-app
 
 FROM postgres:$POSTGRES_VERSION
-ARG POSTGRES_VERSION
-
-ARG LABEL_VCS_URL="https://gitlab.inf.unibz.it/commul/docker/clarin-dspace"
-LABEL maintainer="Alexander König <Alexander.Koenig@eurac.edu>" \
-      maintainer="Egon W. Stemle <egon.stemle@eurac.edu>"
 
 ENV TERM linux
 # APT(-GET) tweaks
 # Set some sane defaults for apt inside docker
 ENV DEBIAN_FRONTEND=noninteractive
-COPY apt.local.conf /etc/apt/apt.conf.d/99local.conf
-#
 #
 RUN apt-get update && \
-    apt-get upgrade
-
-# Install git
-RUN apt-get update && apt-get install git
+    apt-get -y upgrade && \
+    apt-get -y install git && \
+    rm -rf /var/lib/apt/lists/*
 
 # copy int db script
 RUN mkdir -p /docker-entrypoint-initdb.d
@@ -42,9 +35,3 @@ COPY --from=dspace-app /app/utilities/utilities.sql /tmp/sql/
 COPY --from=dspace-app /app/utilities/license_definition.txt /tmp/sql
 RUN chmod -R a+w /tmp/sql/ && \
     perl -pi -e "s#afile :utildir '/license_definition.txt'#afile '/tmp/sql/license_definition.txt'#;" /tmp/sql/utilities.sql
-
-ARG LABEL_VERSION
-ARG LABEL_BUILD_DATE
-LABEL org.label-schema.version="$LABEL_VERSION"
-LABEL org.label-schema.build-date="$LABEL_BUILD_DATE"
-LABEL org.label-schema.vcs-url="$LABEL_VCS_URL"

dockerfiles/postgres/Earthfile

-# THIS IS A GENERATED FILE! See Earthfile.d/ for details.
-#
 # Usage: earthly --push --no-cache +docker
+ARG DSPACE_APP_VERSION
 
 docker-from-docker:
-    FROM DOCKERFILE .
+    FROM DOCKERFILE --build-arg DSPACE_APP_VERSION=$DSPACE_APP_VERSION .
     ARG DOCKER_BASE_URL="gitlab.inf.unibz.it:4567"
     ARG EARTHLY_GIT_PROJECT_NAME  # https://docs.earthly.dev/earthfile/builtin-args
     ARG GIT_PROJECT_NAME="commul/docker/clarin-dspace"
@@ -40,4 +39,4 @@ docker-from-docker:
     SAVE IMAGE --push "$DOCKER_URL:$VERSION"
 
 docker:
-    BUILD +docker-from-docker
+    BUILD --build-arg DSPACE_APP_VERSION=$DSPACE_APP_VERSION +docker-from-docker

dockerfiles/postgres/apt.local.conf

-# Set some sane defaults for docker
-APT { GET { Assume-Yes "true"; }; };
-APT { GET { Fix-Broken "true"; }; };