EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2024-12-25 06:05:37 +03:00
Code Issues Projects Releases Wiki Activity

edge base-image

Browse Source 
in this moccit nginx may be fails
This commit is contained in:
STAM 2020-01-30 12:28:56 +03:00
parent 2e9d850e78
commit 5e1b8ec2a1
21 changed files with 131 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -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

3
CHANGELOG.md
View File

@ -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.

2
balancer/latest/Dockerfile
View File

@ -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

5
epicmorg/README.md Normal file
View File

@ -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.

6
epicmorg/devel/main/Dockerfile
View File

@ -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

1
epicmorg/edge/jdk11/.docker-repository.yml Normal file
View File

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

3
epicmorg/edge/jdk11/.dockerignore Normal file
View File

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

23
epicmorg/edge/jdk11/Dockerfile Normal file
View File

@ -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

5
epicmorg/edge/jdk11/Makefile Normal file
View File

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

1
epicmorg/edge/jdk8/.docker-repository.yml Normal file
View File

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

3
epicmorg/edge/jdk8/.dockerignore Normal file
View File

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

20
epicmorg/edge/jdk8/Dockerfile Normal file
View File

@ -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

5
epicmorg/edge/jdk8/Makefile Normal file
View File

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

1
epicmorg/edge/main/.docker-repository.yml Normal file
View File

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

3
epicmorg/edge/main/.dockerignore Normal file
View File

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

18
epicmorg/edge/main/Dockerfile Normal file
View File

@ -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

5
epicmorg/edge/main/Makefile Normal file
View File

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

15
epicmorg/edge/main/sources.list Normal file
View File

@ -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

2
epicmorg/prod/main/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:buster
FROM debian:buster-slim
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive

2
qbittorrent/latest/Dockerfile
View File

@ -1,4 +1,4 @@
FROM epicmorg/devel
FROM epicmorg/edge
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive

2
qbittorrent/stable/Dockerfile
View File

@ -1,4 +1,4 @@
FROM epicmorg/devel
FROM epicmorg/edge
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive