Merge pull request #36 from EpicMorg/develop

Final January patch.

.travis.yml

@@ -66,6 +66,20 @@ matrix:
       - docker build --compress -t epicmorg/prod:jdk11 epicmorg/prod/jdk11
       - docker push epicmorg/prod:jdk11
 
+##########
+
+    - name: Edge + JDK 8 + JDK 11
+      script:
+      - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+      - docker build --compress -t epicmorg/edge:latest epicmorg/edge/main
+      - docker push epicmorg/edge:latest
+ 
+      - docker build --compress -t epicmorg/edge:jdk8 epicmorg/edge/jdk8
+      - docker push epicmorg/edge:jdk8
+ 
+      - docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge/jdk11
+      - docker push epicmorg/edge:jdk11
+
 ##########
 
     - name: Base Develop  + JDK 8 + JDK 11

CHANGELOG.md

@@ -55,6 +55,10 @@
  		* added to `TeamCity Agent` `atlassian adk` support
 		* updated docker binary
 		* moved back `valve` and `steam-runtime` in to image from `devel`
+	* added `edge` image. 
+		* switched `qbittorrent` images to `edge`
+		* switched final `balancer` image to `edge`
+	* reduced containers size by switching to `debian-slim` base-image.
 * 12/13/2019
     * updated `teamcity agent`. added `php 7.3` support.
     * fixed `nginx` image.

atlassian/bitbucket/latest/Dockerfile

@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################

atlassian/bitbucket/latest/Dockerfile.jdk11

@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################

atlassian/confluence/latest/Dockerfile

@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################

atlassian/confluence/latest/Dockerfile.jdk11

@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################

atlassian/jira/latest/Dockerfile

@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk8
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################

atlassian/jira/latest/Dockerfile.jdk11

@@ -2,6 +2,22 @@ FROM epicmorg/prod:jdk11
 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################

balancer/latest/Dockerfile

@@ -2,6 +2,22 @@ FROM epicmorg/devel AS builder
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
@@ -11,7 +27,7 @@ ARG SRC_DIR=${BUILDS_DIR}/src
 ARG EXPORT_DIR=${BUILDS_DIR}/export
 ARG PRE_DIR=${BUILDS_DIR}/pre
 ARG NGINX_SRC_DIR=${SRC_DIR}/nginx
-ARG NGINX_VERSION=1.17.6
+ARG NGINX_VERSION=1.17.8
 ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
 ARG LUAJIT_INC=/usr/local/include/luajit-2.1
 ARG LUAJIT_LIB=/usr/local/lib
@@ -155,10 +171,26 @@ RUN cd ${NGINX_SRC_DIR} && \
 ##################################################################
 ##################################################################
 
-FROM epicmorg/devel
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   Installing nginx from deb
 ##################################################################

balancer/php/Dockerfile

@@ -2,6 +2,22 @@ FROM epicmorg/balancer:latest
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   Installing php fpn for nginx from deb
 ##################################################################

epicmorg/README.md

@@ -0,0 +1,5 @@
+# Difference between images
+
+* `base` - main image based from debian `buster-slim` with enhanced `sources.list`.
+* `edge` - more recent system image. based on `base` image with switched to `sid` (`sid-slim`) update-channel.
+* `devel` - just enhanced `edge` image with preinstalled some pre requirements.

epicmorg/devel/jdk11/Dockerfile

@@ -2,12 +2,29 @@ FROM epicmorg/devel
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   installing java11
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
     echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
     apt-get update && \
+    apt-get autoremove -y && \
     apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
     mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
     ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \

epicmorg/devel/jdk8/Dockerfile

@@ -2,12 +2,29 @@ FROM epicmorg/devel
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   installing java8
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
     echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
     apt-get update && \
+    apt-get autoremove -y && \
     apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot
 
 

epicmorg/devel/main/Dockerfile

@@ -1,7 +1,23 @@
-FROM epicmorg/prod
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################
@@ -18,9 +34,9 @@ RUN mkdir -p ${SRC_DIR} ${EXPORT_DIR} ${PRE_DIR}
 ##################################################################
 #                   sid sources list
 ##################################################################
-RUN rm /etc/apt/sources.list
+RUN apt update && \
-COPY sources.list /etc/apt/sources.list
+    apt-get autoremove -y && \
-RUN apt autoremove -y && apt update && apt dist-upgrade -y
+    apt dist-upgrade -y
 
 ##################################################################
 #                   deps
@@ -81,7 +97,7 @@ RUN apt-get update && \
     libvpx-dev \
     libvpx6 \
     tcl
- 
+
 ##################################################################
 #                   IP2Location support for prod nginx module
 ##################################################################

epicmorg/edge/jdk11/.docker-repository.yml

@@ -0,0 +1 @@
+repository: epicmorg/edge

epicmorg/edge/jdk11/.dockerignore

@@ -0,0 +1,3 @@
+.git
+scripts
+.idea

epicmorg/edge/jdk11/Dockerfile

@@ -0,0 +1,40 @@
+FROM epicmorg/edge
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
+##################################################################
+#                   installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
+    mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
+    ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
+
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb

epicmorg/edge/jdk11/Makefile

@@ -0,0 +1,5 @@
+all: emgdev
+emgdev:
+	docker build --compress -t epicmorg/edge:jdk11 .
+	docker push epicmorg/edge:jdk11
+

epicmorg/edge/jdk8/.docker-repository.yml

@@ -0,0 +1 @@
+repository: epicmorg/edge

epicmorg/edge/jdk8/.dockerignore

@@ -0,0 +1,3 @@
+.git
+scripts
+.idea

epicmorg/edge/jdk8/Dockerfile

@@ -0,0 +1,37 @@
+FROM epicmorg/edge
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
+##################################################################
+#                   installing java8
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
+    echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+    apt-get update && \
+    apt-get autoremove -y && \
+    apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot
+
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb

epicmorg/edge/jdk8/Makefile

@@ -0,0 +1,5 @@
+all: emgdev
+emgdev:
+	docker build --compress -t epicmorg/edge:jdk8 .
+	docker push epicmorg/edge:jdk8
+

epicmorg/edge/main/.docker-repository.yml

@@ -0,0 +1 @@
+repository: epicmorg/edge

epicmorg/edge/main/.dockerignore

@@ -0,0 +1,3 @@
+.git
+scripts
+.idea

epicmorg/edge/main/Dockerfile

@@ -0,0 +1,37 @@
+FROM epicmorg/prod
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
+##################################################################
+#                   sid sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+RUN  apt update && \
+     apt autoremove -y && \
+     apt dist-upgrade -y && \
+     apt autoremove -y
+
+##################################################################
+#                   cleaninig up
+##################################################################
+RUN apt clean -y && \
+    apt autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb

epicmorg/edge/main/Makefile

@@ -0,0 +1,5 @@
+all: emgdev
+emgdev:
+	docker build --compress -t epicmorg/edge .
+	docker push epicmorg/edge
+

epicmorg/edge/main/sources.list

@@ -0,0 +1,15 @@
+#main
+deb http://ftp.ru.debian.org/debian/ sid main contrib non-free
+deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free
+deb http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free
+deb-src http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free
+deb http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free
+deb-src http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free
+
+#security
+deb http://ftp.ru.debian.org/debian-security/ testing-security main contrib non-free
+deb-src http://ftp.ru.debian.org/debian-security/ testing-security main contrib non-free
+
+##multimedia
+#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free
+#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free

epicmorg/prod/jdk11/Dockerfile

@@ -2,12 +2,29 @@ FROM epicmorg/prod
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   installing java11
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
     echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
     apt-get update && \
+    apt-get autoremove -y && \
     apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
     mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
     ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \

epicmorg/prod/jdk8/Dockerfile

@@ -2,12 +2,29 @@ FROM epicmorg/prod
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   installing java8
 ##################################################################
 RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add - && \
     echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
     apt-get update && \
+    apt-get autoremove -y && \
     apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot
 
 ##################################################################

epicmorg/prod/main/Dockerfile

@@ -1,7 +1,23 @@
-FROM debian:buster
+FROM debian:buster-slim
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   buster sources list
 ##################################################################
@@ -10,6 +26,7 @@ RUN rm /etc/apt/sources.list
 COPY sources.list /etc/apt/sources.list
 RUN apt update && apt dist-upgrade -y
 COPY locale.gen /etc/locale.gen
+RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done
 
 ##################################################################
 #                   installing utils

nextcloud/16/Dockerfile

@@ -1,6 +1,22 @@
 FROM nextcloud:16
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #smb additional magic
 ADD php-smbclient-latest.tar.gz /tmp
 RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \

nextcloud/17/Dockerfile

@@ -1,6 +1,22 @@
 FROM nextcloud:17
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #smb additional magic
 ADD php-smbclient-latest.tar.gz /tmp
 RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \

nextcloud/18/Dockerfile

@@ -1,6 +1,22 @@
 FROM nextcloud:18
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #smb additional magic
 ADD php-smbclient-latest.tar.gz /tmp
 RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \

nextcloud/latest/Dockerfile

@@ -1,6 +1,22 @@
 FROM nextcloud:latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #smb additional magic
 ADD php-smbclient-latest.tar.gz /tmp
 RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \

qbittorrent/latest/Dockerfile

@@ -1,7 +1,23 @@
-FROM epicmorg/devel
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################

qbittorrent/stable/Dockerfile

@@ -1,7 +1,23 @@
-FROM epicmorg/devel
+FROM epicmorg/edge
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   ARGuments
 ##################################################################

teamcity-agent/Dockerfile

@@ -2,6 +2,22 @@ FROM epicmorg/devel:jdk8
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   teamcity minimal agent
 ##################################################################

teamcity-agent/Makefile

@@ -1,4 +1,4 @@
 all: tca
 tca:
 	docker build --compress -t epicmorg/teamcity-agent:latest .
-
+	docker push epicmorg/teamcity-agent:latest

websites/latest/Dockerfile

@@ -2,6 +2,22 @@ FROM epicmorg/prod
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   Installing Apache2 + PHP7
 ##################################################################

websites/latest/Makefile

@@ -1,4 +1,4 @@
 all: php
 php:
-	docker build --compress -t epicmorg/websites .
+	docker build --compress -t epicmorg/websites:latest .
-
+	docker push  epicmorg/websites:latest

websites/php7.2/Dockerfile

@@ -2,6 +2,22 @@ FROM epicmorg/prod
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 ##################################################################
 #                   Installing Apache2 + PHP7
 ##################################################################

websites/php7.2/Makefile

@@ -1,4 +1,4 @@
 all: php
 php:
 	docker build --compress -t epicmorg/websites:php7.2 .
-
+	docker push epicmorg/websites:php7.2

zabbix/agent/Dockerfile

@@ -1,6 +1,21 @@
 FROM zabbix/zabbix-agent:ubuntu-latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
 
 #editing sources list
 RUN rm /etc/apt/sources.list

zabbix/java-gateway/Dockerfile

@@ -1,6 +1,21 @@
 FROM zabbix/zabbix-java-gateway:ubuntu-latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
 
 #editing sources list
 RUN rm /etc/apt/sources.list

zabbix/server/Dockerfile

@@ -1,6 +1,21 @@
 FROM zabbix/zabbix-server-mysql:ubuntu-latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
 
 #editing sources list
 RUN rm /etc/apt/sources.list

zabbix/web/Dockerfile

@@ -1,6 +1,22 @@
 FROM zabbix/zabbix-web-apache-mysql:ubuntu-latest
 ENV DEBIAN_FRONTEND noninteractive
 
+##################################################################
+#   Build-time metadata as defined at http://label-schema.org
+##################################################################
+ARG BUILD_DATE=today
+ARG VCS_REF=master
+ARG VERSION=latest
+LABEL org.label-schema.build-date=$BUILD_DATE \
+          org.label-schema.name="Docker Scripts" \
+          org.label-schema.description="Image for our docker containers." \
+          org.label-schema.url="https://ww.epicm.org/" \
+          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
+          org.label-schema.vendor="EpicMorg" \
+          org.label-schema.version=$VERSION \
+          org.label-schema.schema-version="1.0"
+
 #editing sources list
 RUN rm /etc/apt/sources.list
 COPY sources.list /etc/apt/sources.list