From 5e1b8ec2a12481be6e943b0a9a9e081e9c8075e2 Mon Sep 17 00:00:00 2001 From: STAM Date: Thu, 30 Jan 2020 12:28:56 +0300 Subject: [PATCH] edge base-image in this moccit nginx may be fails --- .travis.yml | 14 +++++++++++++ CHANGELOG.md | 3 +++ balancer/latest/Dockerfile | 2 +- epicmorg/README.md | 5 +++++ epicmorg/devel/main/Dockerfile | 6 ++---- epicmorg/edge/jdk11/.docker-repository.yml | 1 + epicmorg/edge/jdk11/.dockerignore | 3 +++ epicmorg/edge/jdk11/Dockerfile | 23 ++++++++++++++++++++++ epicmorg/edge/jdk11/Makefile | 5 +++++ epicmorg/edge/jdk8/.docker-repository.yml | 1 + epicmorg/edge/jdk8/.dockerignore | 3 +++ epicmorg/edge/jdk8/Dockerfile | 20 +++++++++++++++++++ epicmorg/edge/jdk8/Makefile | 5 +++++ epicmorg/edge/main/.docker-repository.yml | 1 + epicmorg/edge/main/.dockerignore | 3 +++ epicmorg/edge/main/Dockerfile | 18 +++++++++++++++++ epicmorg/edge/main/Makefile | 5 +++++ epicmorg/edge/main/sources.list | 15 ++++++++++++++ epicmorg/prod/main/Dockerfile | 2 +- qbittorrent/latest/Dockerfile | 2 +- qbittorrent/stable/Dockerfile | 2 +- 21 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 epicmorg/README.md create mode 100644 epicmorg/edge/jdk11/.docker-repository.yml create mode 100644 epicmorg/edge/jdk11/.dockerignore create mode 100644 epicmorg/edge/jdk11/Dockerfile create mode 100644 epicmorg/edge/jdk11/Makefile create mode 100644 epicmorg/edge/jdk8/.docker-repository.yml create mode 100644 epicmorg/edge/jdk8/.dockerignore create mode 100644 epicmorg/edge/jdk8/Dockerfile create mode 100644 epicmorg/edge/jdk8/Makefile create mode 100644 epicmorg/edge/main/.docker-repository.yml create mode 100644 epicmorg/edge/main/.dockerignore create mode 100644 epicmorg/edge/main/Dockerfile create mode 100644 epicmorg/edge/main/Makefile create mode 100644 epicmorg/edge/main/sources.list diff --git a/.travis.yml b/.travis.yml index 48fff8d6c..075c10544 100644 --- a/.travis.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7bb955ffa..214ac1403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,9 @@ * 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` to `edge` * 12/13/2019 * updated `teamcity agent`. added `php 7.3` support. * fixed `nginx` image. diff --git a/balancer/latest/Dockerfile b/balancer/latest/Dockerfile index 75f7b2af9..fba57a9fd 100644 --- a/balancer/latest/Dockerfile +++ b/balancer/latest/Dockerfile @@ -155,7 +155,7 @@ RUN cd ${NGINX_SRC_DIR} && \ ################################################################## ################################################################## -FROM epicmorg/devel +FROM epicmorg/edge LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/README.md b/epicmorg/README.md new file mode 100644 index 000000000..3d25e59b6 --- /dev/null +++ b/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. \ No newline at end of file diff --git a/epicmorg/devel/main/Dockerfile b/epicmorg/devel/main/Dockerfile index 12289edab..0d679dc74 100644 --- a/epicmorg/devel/main/Dockerfile +++ b/epicmorg/devel/main/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/edge LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -18,9 +18,7 @@ RUN mkdir -p ${SRC_DIR} ${EXPORT_DIR} ${PRE_DIR} ################################################################## # 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 dist-upgrade -y ################################################################## # deps diff --git a/epicmorg/edge/jdk11/.docker-repository.yml b/epicmorg/edge/jdk11/.docker-repository.yml new file mode 100644 index 000000000..7d6511aa9 --- /dev/null +++ b/epicmorg/edge/jdk11/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/edge diff --git a/epicmorg/edge/jdk11/.dockerignore b/epicmorg/edge/jdk11/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/epicmorg/edge/jdk11/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/epicmorg/edge/jdk11/Dockerfile b/epicmorg/edge/jdk11/Dockerfile new file mode 100644 index 000000000..9b3608efe --- /dev/null +++ b/epicmorg/edge/jdk11/Dockerfile @@ -0,0 +1,23 @@ +FROM epicmorg/edge +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# 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 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 diff --git a/epicmorg/edge/jdk11/Makefile b/epicmorg/edge/jdk11/Makefile new file mode 100644 index 000000000..1bcad05b2 --- /dev/null +++ b/epicmorg/edge/jdk11/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/edge:jdk11 . + docker push epicmorg/edge:jdk11 + diff --git a/epicmorg/edge/jdk8/.docker-repository.yml b/epicmorg/edge/jdk8/.docker-repository.yml new file mode 100644 index 000000000..7d6511aa9 --- /dev/null +++ b/epicmorg/edge/jdk8/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/edge diff --git a/epicmorg/edge/jdk8/.dockerignore b/epicmorg/edge/jdk8/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/epicmorg/edge/jdk8/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/epicmorg/edge/jdk8/Dockerfile b/epicmorg/edge/jdk8/Dockerfile new file mode 100644 index 000000000..51fc46097 --- /dev/null +++ b/epicmorg/edge/jdk8/Dockerfile @@ -0,0 +1,20 @@ +FROM epicmorg/edge +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# 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 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 diff --git a/epicmorg/edge/jdk8/Makefile b/epicmorg/edge/jdk8/Makefile new file mode 100644 index 000000000..6a17f6dc8 --- /dev/null +++ b/epicmorg/edge/jdk8/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/edge:jdk8 . + docker push epicmorg/edge:jdk8 + diff --git a/epicmorg/edge/main/.docker-repository.yml b/epicmorg/edge/main/.docker-repository.yml new file mode 100644 index 000000000..7d6511aa9 --- /dev/null +++ b/epicmorg/edge/main/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/edge diff --git a/epicmorg/edge/main/.dockerignore b/epicmorg/edge/main/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/epicmorg/edge/main/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/epicmorg/edge/main/Dockerfile b/epicmorg/edge/main/Dockerfile new file mode 100644 index 000000000..2da7aebb3 --- /dev/null +++ b/epicmorg/edge/main/Dockerfile @@ -0,0 +1,18 @@ +FROM epicmorg/prod +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# 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 + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/edge/main/Makefile b/epicmorg/edge/main/Makefile new file mode 100644 index 000000000..c44f1d984 --- /dev/null +++ b/epicmorg/edge/main/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/edge . + docker push epicmorg/edge + diff --git a/epicmorg/edge/main/sources.list b/epicmorg/edge/main/sources.list new file mode 100644 index 000000000..91edac4fa --- /dev/null +++ b/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 diff --git a/epicmorg/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile index e41d7f189..ee462ba2e 100644 --- a/epicmorg/prod/main/Dockerfile +++ b/epicmorg/prod/main/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:buster-slim LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/qbittorrent/latest/Dockerfile b/qbittorrent/latest/Dockerfile index 758ad51a0..9d1f08757 100644 --- a/qbittorrent/latest/Dockerfile +++ b/qbittorrent/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/edge LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/qbittorrent/stable/Dockerfile b/qbittorrent/stable/Dockerfile index 54dc0bf01..a6007cf0b 100644 --- a/qbittorrent/stable/Dockerfile +++ b/qbittorrent/stable/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/edge LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive