From dd1a972104cd135478c9bcda82122387035e5591 Mon Sep 17 00:00:00 2001 From: Odmin Date: Thu, 30 Jan 2020 18:36:30 +0300 Subject: [PATCH] nginx 1.17.8; reduced containers sizes --- atlassian/bitbucket/latest/Dockerfile | 16 +++++++++ atlassian/bitbucket/latest/Dockerfile.jdk11 | 16 +++++++++ atlassian/confluence/latest/Dockerfile | 16 +++++++++ atlassian/confluence/latest/Dockerfile.jdk11 | 16 +++++++++ atlassian/jira/latest/Dockerfile | 16 +++++++++ atlassian/jira/latest/Dockerfile.jdk11 | 16 +++++++++ balancer/latest/Dockerfile | 34 +++++++++++++++++++- balancer/php/Dockerfile | 16 +++++++++ epicmorg/devel/jdk11/Dockerfile | 17 ++++++++++ epicmorg/devel/jdk8/Dockerfile | 17 ++++++++++ epicmorg/devel/main/Dockerfile | 22 +++++++++++-- epicmorg/edge/jdk11/Dockerfile | 17 ++++++++++ epicmorg/edge/jdk8/Dockerfile | 17 ++++++++++ epicmorg/edge/main/Dockerfile | 21 +++++++++++- epicmorg/prod/jdk11/Dockerfile | 17 ++++++++++ epicmorg/prod/jdk8/Dockerfile | 17 ++++++++++ epicmorg/prod/main/Dockerfile | 17 ++++++++++ nextcloud/16/Dockerfile | 16 +++++++++ nextcloud/17/Dockerfile | 16 +++++++++ nextcloud/18/Dockerfile | 16 +++++++++ nextcloud/latest/Dockerfile | 16 +++++++++ qbittorrent/latest/Dockerfile | 16 +++++++++ qbittorrent/stable/Dockerfile | 16 +++++++++ teamcity-agent/Dockerfile | 16 +++++++++ teamcity-agent/Makefile | 2 +- websites/latest/Dockerfile | 16 +++++++++ websites/latest/Makefile | 4 +-- websites/php7.2/Dockerfile | 16 +++++++++ websites/php7.2/Makefile | 2 +- zabbix/agent/Dockerfile | 15 +++++++++ zabbix/java-gateway/Dockerfile | 15 +++++++++ zabbix/server/Dockerfile | 15 +++++++++ zabbix/web/Dockerfile | 16 +++++++++ 33 files changed, 513 insertions(+), 8 deletions(-) diff --git a/atlassian/bitbucket/latest/Dockerfile b/atlassian/bitbucket/latest/Dockerfile index e4dd232d7..3cec384db 100644 --- a/atlassian/bitbucket/latest/Dockerfile +++ b/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 ################################################################## diff --git a/atlassian/bitbucket/latest/Dockerfile.jdk11 b/atlassian/bitbucket/latest/Dockerfile.jdk11 index 053caa0ff..84e4351c7 100644 --- a/atlassian/bitbucket/latest/Dockerfile.jdk11 +++ b/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 ################################################################## diff --git a/atlassian/confluence/latest/Dockerfile b/atlassian/confluence/latest/Dockerfile index 107b68b3b..e5c69c4e4 100644 --- a/atlassian/confluence/latest/Dockerfile +++ b/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 ################################################################## diff --git a/atlassian/confluence/latest/Dockerfile.jdk11 b/atlassian/confluence/latest/Dockerfile.jdk11 index 3aee00b73..d6e1745c8 100644 --- a/atlassian/confluence/latest/Dockerfile.jdk11 +++ b/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 ################################################################## diff --git a/atlassian/jira/latest/Dockerfile b/atlassian/jira/latest/Dockerfile index 947578d9a..2aa25629b 100644 --- a/atlassian/jira/latest/Dockerfile +++ b/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 ################################################################## diff --git a/atlassian/jira/latest/Dockerfile.jdk11 b/atlassian/jira/latest/Dockerfile.jdk11 index 6902e4045..13b0d8d58 100644 --- a/atlassian/jira/latest/Dockerfile.jdk11 +++ b/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 ################################################################## diff --git a/balancer/latest/Dockerfile b/balancer/latest/Dockerfile index fba57a9fd..375cd2802 100644 --- a/balancer/latest/Dockerfile +++ b/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 @@ -159,6 +175,22 @@ 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 ################################################################## diff --git a/balancer/php/Dockerfile b/balancer/php/Dockerfile index d581153d5..e51c1c1ed 100644 --- a/balancer/php/Dockerfile +++ b/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 ################################################################## diff --git a/epicmorg/devel/jdk11/Dockerfile b/epicmorg/devel/jdk11/Dockerfile index e97bdf420..ba82941ea 100644 --- a/epicmorg/devel/jdk11/Dockerfile +++ b/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 && \ diff --git a/epicmorg/devel/jdk8/Dockerfile b/epicmorg/devel/jdk8/Dockerfile index a9cf2ba58..bda777f92 100644 --- a/epicmorg/devel/jdk8/Dockerfile +++ b/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 diff --git a/epicmorg/devel/main/Dockerfile b/epicmorg/devel/main/Dockerfile index 0d679dc74..bda43a142 100644 --- a/epicmorg/devel/main/Dockerfile +++ b/epicmorg/devel/main/Dockerfile @@ -2,6 +2,22 @@ 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,7 +34,9 @@ RUN mkdir -p ${SRC_DIR} ${EXPORT_DIR} ${PRE_DIR} ################################################################## # sid sources list ################################################################## -RUN apt update && apt dist-upgrade -y +RUN apt update && \ + apt-get autoremove -y && \ + apt dist-upgrade -y ################################################################## # deps @@ -79,7 +97,7 @@ RUN apt-get update && \ libvpx-dev \ libvpx6 \ tcl - + ################################################################## # IP2Location support for prod nginx module ################################################################## diff --git a/epicmorg/edge/jdk11/Dockerfile b/epicmorg/edge/jdk11/Dockerfile index 9b3608efe..62c0cf889 100644 --- a/epicmorg/edge/jdk11/Dockerfile +++ b/epicmorg/edge/jdk11/Dockerfile @@ -2,12 +2,29 @@ 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 && \ diff --git a/epicmorg/edge/jdk8/Dockerfile b/epicmorg/edge/jdk8/Dockerfile index 51fc46097..5672315af 100644 --- a/epicmorg/edge/jdk8/Dockerfile +++ b/epicmorg/edge/jdk8/Dockerfile @@ -2,12 +2,29 @@ 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 diff --git a/epicmorg/edge/main/Dockerfile b/epicmorg/edge/main/Dockerfile index 2da7aebb3..669c7e77f 100644 --- a/epicmorg/edge/main/Dockerfile +++ b/epicmorg/edge/main/Dockerfile @@ -2,12 +2,31 @@ 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 autoremove -y && apt update && apt dist-upgrade -y +RUN apt update && \ + apt autoremove -y && \ + apt dist-upgrade -y && \ + apt autoremove -y ################################################################## # cleaninig up diff --git a/epicmorg/prod/jdk11/Dockerfile b/epicmorg/prod/jdk11/Dockerfile index 4601e9a69..03dc3feb3 100644 --- a/epicmorg/prod/jdk11/Dockerfile +++ b/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 && \ diff --git a/epicmorg/prod/jdk8/Dockerfile b/epicmorg/prod/jdk8/Dockerfile index 4d5d8c7b4..98d6b682e 100644 --- a/epicmorg/prod/jdk8/Dockerfile +++ b/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 ################################################################## diff --git a/epicmorg/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile index ee462ba2e..b7bcc64e8 100644 --- a/epicmorg/prod/main/Dockerfile +++ b/epicmorg/prod/main/Dockerfile @@ -2,6 +2,22 @@ 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 diff --git a/nextcloud/16/Dockerfile b/nextcloud/16/Dockerfile index 2ab40d8be..420e0dcb4 100644 --- a/nextcloud/16/Dockerfile +++ b/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 && \ diff --git a/nextcloud/17/Dockerfile b/nextcloud/17/Dockerfile index 15be670b0..f345d7440 100644 --- a/nextcloud/17/Dockerfile +++ b/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 && \ diff --git a/nextcloud/18/Dockerfile b/nextcloud/18/Dockerfile index 9038ea57a..1d87a0a9c 100644 --- a/nextcloud/18/Dockerfile +++ b/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 && \ diff --git a/nextcloud/latest/Dockerfile b/nextcloud/latest/Dockerfile index dc0e55f7f..835db1dd4 100644 --- a/nextcloud/latest/Dockerfile +++ b/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 && \ diff --git a/qbittorrent/latest/Dockerfile b/qbittorrent/latest/Dockerfile index 9d1f08757..d3102702d 100644 --- a/qbittorrent/latest/Dockerfile +++ b/qbittorrent/latest/Dockerfile @@ -2,6 +2,22 @@ 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 ################################################################## diff --git a/qbittorrent/stable/Dockerfile b/qbittorrent/stable/Dockerfile index a6007cf0b..646d1e848 100644 --- a/qbittorrent/stable/Dockerfile +++ b/qbittorrent/stable/Dockerfile @@ -2,6 +2,22 @@ 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 ################################################################## diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile index 7b2da62c9..989f9dc8c 100644 --- a/teamcity-agent/Dockerfile +++ b/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 ################################################################## diff --git a/teamcity-agent/Makefile b/teamcity-agent/Makefile index 589ca6d1c..a1e173ea9 100644 --- a/teamcity-agent/Makefile +++ b/teamcity-agent/Makefile @@ -1,4 +1,4 @@ all: tca tca: docker build --compress -t epicmorg/teamcity-agent:latest . - + docker push epicmorg/teamcity-agent:latest diff --git a/websites/latest/Dockerfile b/websites/latest/Dockerfile index 5259091cd..61486d9a4 100644 --- a/websites/latest/Dockerfile +++ b/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 ################################################################## diff --git a/websites/latest/Makefile b/websites/latest/Makefile index fdb3736cb..87bc7ce7c 100644 --- a/websites/latest/Makefile +++ b/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 diff --git a/websites/php7.2/Dockerfile b/websites/php7.2/Dockerfile index 61d2bc8b7..eed516723 100644 --- a/websites/php7.2/Dockerfile +++ b/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 ################################################################## diff --git a/websites/php7.2/Makefile b/websites/php7.2/Makefile index 833e8e82f..a15fcdd63 100644 --- a/websites/php7.2/Makefile +++ b/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 diff --git a/zabbix/agent/Dockerfile b/zabbix/agent/Dockerfile index 7282162a6..d21a99d15 100644 --- a/zabbix/agent/Dockerfile +++ b/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 diff --git a/zabbix/java-gateway/Dockerfile b/zabbix/java-gateway/Dockerfile index 337e2ea4a..998410762 100644 --- a/zabbix/java-gateway/Dockerfile +++ b/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 diff --git a/zabbix/server/Dockerfile b/zabbix/server/Dockerfile index 228b4a103..9042ad89d 100644 --- a/zabbix/server/Dockerfile +++ b/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 diff --git a/zabbix/web/Dockerfile b/zabbix/web/Dockerfile index 136e489ab..efe03a98e 100644 --- a/zabbix/web/Dockerfile +++ b/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