From bdc88f3bf397a0151c879c27d662103179873050 Mon Sep 17 00:00:00 2001 From: STAM Date: Fri, 4 Sep 2020 19:00:05 +0300 Subject: [PATCH] fixes --- epicmorg/README.md | 3 - epicmorg/devel-bullseye/jdk11/Dockerfile | 24 ------ epicmorg/devel-bullseye/jdk11/Makefile | 5 -- epicmorg/devel-bullseye/jdk6/Dockerfile | 20 ----- epicmorg/devel-bullseye/jdk6/Makefile | 5 -- epicmorg/devel-bullseye/jdk7/Dockerfile | 20 ----- epicmorg/devel-bullseye/jdk7/Makefile | 5 -- epicmorg/devel-bullseye/jdk8/Dockerfile | 21 ------ epicmorg/devel-bullseye/jdk8/Makefile | 5 -- epicmorg/devel-bullseye/main/Dockerfile | 96 ------------------------ epicmorg/devel-bullseye/main/Makefile | 5 -- epicmorg/edge/main/Dockerfile | 3 +- epicmorg/edge/main/sources.list | 19 ----- epicmorg/edge/main/sources.sid.list | 7 ++ epicmorg/egde-bullseye/jdk11/Dockerfile | 24 ------ epicmorg/egde-bullseye/jdk11/Makefile | 5 -- epicmorg/egde-bullseye/jdk6/Dockerfile | 20 ----- epicmorg/egde-bullseye/jdk6/Makefile | 5 -- epicmorg/egde-bullseye/jdk7/Dockerfile | 20 ----- epicmorg/egde-bullseye/jdk7/Makefile | 5 -- epicmorg/egde-bullseye/jdk8/Dockerfile | 21 ------ epicmorg/egde-bullseye/jdk8/Makefile | 5 -- epicmorg/egde-bullseye/main/Dockerfile | 22 ------ epicmorg/egde-bullseye/main/Makefile | 5 -- epicmorg/egde-bullseye/main/sources.list | 19 ----- teamcity-agent/Dockerfile | 23 ++++-- websites/latest/Dockerfile | 2 + websites/php7.4/Dockerfile | 2 + 28 files changed, 29 insertions(+), 387 deletions(-) delete mode 100644 epicmorg/devel-bullseye/jdk11/Dockerfile delete mode 100644 epicmorg/devel-bullseye/jdk11/Makefile delete mode 100644 epicmorg/devel-bullseye/jdk6/Dockerfile delete mode 100644 epicmorg/devel-bullseye/jdk6/Makefile delete mode 100644 epicmorg/devel-bullseye/jdk7/Dockerfile delete mode 100644 epicmorg/devel-bullseye/jdk7/Makefile delete mode 100644 epicmorg/devel-bullseye/jdk8/Dockerfile delete mode 100644 epicmorg/devel-bullseye/jdk8/Makefile delete mode 100644 epicmorg/devel-bullseye/main/Dockerfile delete mode 100644 epicmorg/devel-bullseye/main/Makefile delete mode 100644 epicmorg/edge/main/sources.list create mode 100644 epicmorg/edge/main/sources.sid.list delete mode 100644 epicmorg/egde-bullseye/jdk11/Dockerfile delete mode 100644 epicmorg/egde-bullseye/jdk11/Makefile delete mode 100644 epicmorg/egde-bullseye/jdk6/Dockerfile delete mode 100644 epicmorg/egde-bullseye/jdk6/Makefile delete mode 100644 epicmorg/egde-bullseye/jdk7/Dockerfile delete mode 100644 epicmorg/egde-bullseye/jdk7/Makefile delete mode 100644 epicmorg/egde-bullseye/jdk8/Dockerfile delete mode 100644 epicmorg/egde-bullseye/jdk8/Makefile delete mode 100644 epicmorg/egde-bullseye/main/Dockerfile delete mode 100644 epicmorg/egde-bullseye/main/Makefile delete mode 100644 epicmorg/egde-bullseye/main/sources.list diff --git a/epicmorg/README.md b/epicmorg/README.md index e51402540..044c898f1 100644 --- a/epicmorg/README.md +++ b/epicmorg/README.md @@ -3,6 +3,3 @@ * `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. - -* `egde-bullseye` - more recent system image. based on `base` image with switched to `bullseye` (`bullseye-slim`) update-channel. -* `devel-bullseye` - just enhanced `egde-bullseye` image with preinstalled some pre requirements. \ No newline at end of file diff --git a/epicmorg/devel-bullseye/jdk11/Dockerfile b/epicmorg/devel-bullseye/jdk11/Dockerfile deleted file mode 100644 index 40e38afb7..000000000 --- a/epicmorg/devel-bullseye/jdk11/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM epicmorg/devel:bullseye -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 | 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 diff --git a/epicmorg/devel-bullseye/jdk11/Makefile b/epicmorg/devel-bullseye/jdk11/Makefile deleted file mode 100644 index b9d772bb9..000000000 --- a/epicmorg/devel-bullseye/jdk11/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/devel:bullseye-jdk11 . - docker push epicmorg/devel:bullseye-jdk11 - diff --git a/epicmorg/devel-bullseye/jdk6/Dockerfile b/epicmorg/devel-bullseye/jdk6/Dockerfile deleted file mode 100644 index c7868c0d6..000000000 --- a/epicmorg/devel-bullseye/jdk6/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM epicmorg/devel:bullseye -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java6 -################################################################## -RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \ - echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \ - apt-get update -y && \ - apt-get install -y --allow-unauthenticated zulu-6 && \ - java -version - -################################################################## -# 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/devel-bullseye/jdk6/Makefile b/epicmorg/devel-bullseye/jdk6/Makefile deleted file mode 100644 index 2524a5ef3..000000000 --- a/epicmorg/devel-bullseye/jdk6/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/devel:bullseye-jdk6 . - docker push epicmorg/devel:bullseye-jdk6 - diff --git a/epicmorg/devel-bullseye/jdk7/Dockerfile b/epicmorg/devel-bullseye/jdk7/Dockerfile deleted file mode 100644 index 134f56db6..000000000 --- a/epicmorg/devel-bullseye/jdk7/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM epicmorg/devel:bullseye -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java7 -################################################################## -RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \ - echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \ - apt-get update -y && \ - apt-get install -y --allow-unauthenticated zulu-7 && \ - java -version - -################################################################## -# 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/devel-bullseye/jdk7/Makefile b/epicmorg/devel-bullseye/jdk7/Makefile deleted file mode 100644 index ac1c20a99..000000000 --- a/epicmorg/devel-bullseye/jdk7/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/devel:bullseye-jdk7 . - docker push epicmorg/devel:bullseye-jdk7 - diff --git a/epicmorg/devel-bullseye/jdk8/Dockerfile b/epicmorg/devel-bullseye/jdk8/Dockerfile deleted file mode 100644 index f4f1c51a5..000000000 --- a/epicmorg/devel-bullseye/jdk8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM epicmorg/devel:bullseye -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 | 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 diff --git a/epicmorg/devel-bullseye/jdk8/Makefile b/epicmorg/devel-bullseye/jdk8/Makefile deleted file mode 100644 index 78a311c87..000000000 --- a/epicmorg/devel-bullseye/jdk8/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/devel:bullseye-jdk8 . - docker push epicmorg/devel:bullseye-jdk8 - diff --git a/epicmorg/devel-bullseye/main/Dockerfile b/epicmorg/devel-bullseye/main/Dockerfile deleted file mode 100644 index 7cac181e0..000000000 --- a/epicmorg/devel-bullseye/main/Dockerfile +++ /dev/null @@ -1,96 +0,0 @@ -FROM epicmorg/edge:bullseye -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# ARGuments -################################################################## -ENV BuildDocker true -ARG BUILDS_DIR=/builds -ARG SRC_DIR=${BUILDS_DIR}/src -ARG EXPORT_DIR=${BUILDS_DIR}/export - -################################################################## -# Files and folders -################################################################## -RUN mkdir -p ${SRC_DIR} ${EXPORT_DIR} ${PRE_DIR} - -################################################################## -# sid sources list -################################################################## -RUN apt update && \ - apt-get autoremove -y && \ - apt dist-upgrade -y - -################################################################## -# deps -################################################################## -RUN apt-get update && \ - apt install -y --allow-unauthenticated --allow-downgrades \ - build-essential \ - gcc-multilib \ - g++-multilib \ - libxkbcommon-dev \ - zlib1g-dev \ - libfreetype6-dev \ - libegl1-mesa-dev \ - libgles2-mesa-dev \ - libgbm-dev \ - nvidia-cg-toolkit \ - nvidia-cg-dev \ - libavcodec-dev \ - libsdl2-dev \ - libsdl-image1.2-dev \ - libxml2-dev yasm \ - devscripts \ - autoconf \ - automake \ - libtool \ - autotools-dev \ - dpkg-dev \ - fakeroot \ - checkinstall \ - dh-make \ - zlib1g \ - zlib1g-dev \ - libssl-dev \ - libxml2-dev \ - libxslt-dev \ - libgd-dev \ - libpcre3-dev \ - libgeoip-dev \ - libkrb5-dev \ - libperl-dev \ - krb5-user \ - luajit \ - liblua5.1-0-dev \ - libmaxminddb-dev \ - libpam0g-dev \ - libldap2-dev \ - libavformat-dev \ - libavfilter-dev \ - libswscale-dev \ - libavcodec-dev \ - libz-dev \ - libhiredis-dev \ - libzip-dev \ - libcrypto++-dev \ - libbz2-dev \ - libvpx-dev \ - libvpx6 \ - tcl - - -################################################################## -# other customisations -################################################################## - - -################################################################## -# cleaninig up -################################################################## -RUN apt purge policykit-1 -y && \ - apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/devel-bullseye/main/Makefile b/epicmorg/devel-bullseye/main/Makefile deleted file mode 100644 index b748fba07..000000000 --- a/epicmorg/devel-bullseye/main/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/devel:bullseye . - docker push epicmorg/devel:bullseye - diff --git a/epicmorg/edge/main/Dockerfile b/epicmorg/edge/main/Dockerfile index 335d412a7..bc2be7e5e 100644 --- a/epicmorg/edge/main/Dockerfile +++ b/epicmorg/edge/main/Dockerfile @@ -5,8 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # sid sources list ################################################################## -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list +COPY sources.sid.list /etc/apt/sources.list.d/sources.sid.list RUN apt update && \ apt autoremove -y && \ apt dist-upgrade -y && \ diff --git a/epicmorg/edge/main/sources.list b/epicmorg/edge/main/sources.list deleted file mode 100644 index 677a95436..000000000 --- a/epicmorg/edge/main/sources.list +++ /dev/null @@ -1,19 +0,0 @@ -#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 - -#backports -#deb http://ftp.ru.debian.org/debian/ testing-backports main contrib non-free -#deb-src http://ftp.ru.debian.org/debian/ testing-backports 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/edge/main/sources.sid.list b/epicmorg/edge/main/sources.sid.list new file mode 100644 index 000000000..d3d573cdc --- /dev/null +++ b/epicmorg/edge/main/sources.sid.list @@ -0,0 +1,7 @@ +#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 + +##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/egde-bullseye/jdk11/Dockerfile b/epicmorg/egde-bullseye/jdk11/Dockerfile deleted file mode 100644 index b947fb38b..000000000 --- a/epicmorg/egde-bullseye/jdk11/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM epicmorg/egde:bullseye -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 | 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 diff --git a/epicmorg/egde-bullseye/jdk11/Makefile b/epicmorg/egde-bullseye/jdk11/Makefile deleted file mode 100644 index 851aea2c4..000000000 --- a/epicmorg/egde-bullseye/jdk11/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/edge:bullseye-jdk11 . - docker push epicmorg/edge:bullseye-jdk11 - diff --git a/epicmorg/egde-bullseye/jdk6/Dockerfile b/epicmorg/egde-bullseye/jdk6/Dockerfile deleted file mode 100644 index 634a3ed7d..000000000 --- a/epicmorg/egde-bullseye/jdk6/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM epicmorg/edge:bullseye -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java6 -################################################################## -RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \ - echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \ - apt-get update -y && \ - apt-get install -y --allow-unauthenticated zulu-6 && \ - java -version - -################################################################## -# 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/egde-bullseye/jdk6/Makefile b/epicmorg/egde-bullseye/jdk6/Makefile deleted file mode 100644 index 365bf997e..000000000 --- a/epicmorg/egde-bullseye/jdk6/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/edge:bullseye-jdk6 . - docker push epicmorg/edge:bullseye-jdk6 - diff --git a/epicmorg/egde-bullseye/jdk7/Dockerfile b/epicmorg/egde-bullseye/jdk7/Dockerfile deleted file mode 100644 index d168a0a25..000000000 --- a/epicmorg/egde-bullseye/jdk7/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM epicmorg/edge:bullseye -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java7 -################################################################## -RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \ - echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \ - apt-get update -y && \ - apt-get install -y --allow-unauthenticated zulu-7 && \ - java -version - -################################################################## -# 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/egde-bullseye/jdk7/Makefile b/epicmorg/egde-bullseye/jdk7/Makefile deleted file mode 100644 index 5e0a1fa24..000000000 --- a/epicmorg/egde-bullseye/jdk7/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/edge:bullseye-jdk7 . - docker push epicmorg/edge:bullseye-jdk7 - diff --git a/epicmorg/egde-bullseye/jdk8/Dockerfile b/epicmorg/egde-bullseye/jdk8/Dockerfile deleted file mode 100644 index cb28223cc..000000000 --- a/epicmorg/egde-bullseye/jdk8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM epicmorg/edge:bullseye -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 | 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 diff --git a/epicmorg/egde-bullseye/jdk8/Makefile b/epicmorg/egde-bullseye/jdk8/Makefile deleted file mode 100644 index 226c0e1c0..000000000 --- a/epicmorg/egde-bullseye/jdk8/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/edge:bullseye-jdk8 . - docker push epicmorg/edge:bullseye-jdk8 - diff --git a/epicmorg/egde-bullseye/main/Dockerfile b/epicmorg/egde-bullseye/main/Dockerfile deleted file mode 100644 index 335d412a7..000000000 --- a/epicmorg/egde-bullseye/main/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -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 update && \ - apt autoremove -y && \ - apt dist-upgrade -y && \ - apt autoremove -y - -################################################################## -# cleaninig up -################################################################## -RUN apt purge policykit-1 -y && \ - apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/egde-bullseye/main/Makefile b/epicmorg/egde-bullseye/main/Makefile deleted file mode 100644 index a8a71c1ac..000000000 --- a/epicmorg/egde-bullseye/main/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/egde:bullseye . - docker push epicmorg/egde:bullseye - diff --git a/epicmorg/egde-bullseye/main/sources.list b/epicmorg/egde-bullseye/main/sources.list deleted file mode 100644 index 7aa315b6f..000000000 --- a/epicmorg/egde-bullseye/main/sources.list +++ /dev/null @@ -1,19 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ bullseye main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ bullseye main contrib non-free -deb http://ftp.ru.debian.org/debian/ bullseye-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ bullseye-updates main contrib non-free -deb http://ftp.ru.debian.org/debian/ bullseye-backports main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ bullseye-backports main contrib non-free -deb http://ftp.ru.debian.org/debian/ bullseye-proposed-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ bullseye-proposed-updates main contrib non-free - -#security -#deb http://ftp.ru.debian.org/debian-security/ bullseye/updates main contrib non-free -#deb-src http://ftp.ru.debian.org/debian-security/ bullseye/updates main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ bullseye main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ bullseye main non-free -#deb http://ftp.ru.debian.org/debian-multimedia/ bullseye-backports main -#deb-src http://ftp.ru.debian.org/debian-multimedia/ bullseye-backports main diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile index 3163d4f64..49f51f6de 100644 --- a/teamcity-agent/Dockerfile +++ b/teamcity-agent/Dockerfile @@ -2,6 +2,18 @@ FROM epicmorg/devel:jdk11 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive +################################################################## +# bullseye sources list +################################################################## +#COPY sources.bullseye.list /etc/apt/sources.list.d/sources.bullseye.list +RUN apt update && \ + + apt autoremove -y && \ + apt dist-upgrade -y && \ + apt autoremove -y + + + ################################################################## # teamcity minimal agent ################################################################## @@ -268,17 +280,16 @@ RUN cd /tmp && \ composer global require elendev/nexus-composer-push && \ composer -RUN sudo apt purge libpython2* -y -RUN sudo apt install python2-minimal -y + ################################################################## -# Node.js 12.x +# Node.js 14.x ################################################################## -RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ +RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list && \ + echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \ apt-get update && \ - apt-get install -y nodejs yarn + apt-get install -y --allow-downgrades nodejs yarn ################################################################## # steam runtime and ssdk diff --git a/websites/latest/Dockerfile b/websites/latest/Dockerfile index 490754c90..175638da6 100644 --- a/websites/latest/Dockerfile +++ b/websites/latest/Dockerfile @@ -39,6 +39,7 @@ RUN apt-get update && \ php-memcached \ php-memcache \ php-igbinary \ + php-interbase \ php-curl \ php-gd \ php-intl \ @@ -80,6 +81,7 @@ RUN apt-get update && \ # gettext \ gnupg \ iconv \ + interbase \ imap \ json \ mbstring \ diff --git a/websites/php7.4/Dockerfile b/websites/php7.4/Dockerfile index 490754c90..d827a13dd 100644 --- a/websites/php7.4/Dockerfile +++ b/websites/php7.4/Dockerfile @@ -39,6 +39,7 @@ RUN apt-get update && \ php-memcached \ php-memcache \ php-igbinary \ + php-interbase \ php-curl \ php-gd \ php-intl \ @@ -81,6 +82,7 @@ RUN apt-get update && \ gnupg \ iconv \ imap \ + interbase \ json \ mbstring \ memcached \