mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2025-02-04 01:30:40 +03:00
fixes
This commit is contained in:
parent
f456c46815
commit
be3203594d
@ -162,14 +162,14 @@ matrix:
|
||||
- docker build --compress -t epicmorg/balancer:latest balancer/latest
|
||||
- docker push epicmorg/balancer:latest
|
||||
|
||||
- name: NGinx + PHP7.3
|
||||
- name: NGinx + PHP7.4
|
||||
script:
|
||||
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
|
||||
- docker build --compress -t epicmorg/balancer:php balancer/php
|
||||
- docker push epicmorg/balancer:php
|
||||
|
||||
|
||||
- name: Apache + PHP7.3
|
||||
- name: Apache + PHP7.4
|
||||
script:
|
||||
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
|
||||
- docker build --compress -t epicmorg/websites:latest websites/latest
|
||||
|
||||
@ -36,7 +36,7 @@ RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
|
||||
php-xmlrpc \
|
||||
php-xml \
|
||||
php-mbstring \
|
||||
php-gettext \
|
||||
# php-gettext \
|
||||
php7.4-cli \
|
||||
php-common \
|
||||
php-cgi \
|
||||
@ -66,7 +66,7 @@ RUN phpenmod \
|
||||
fileinfo \
|
||||
gd \
|
||||
geoip \
|
||||
gettext \
|
||||
# gettext \
|
||||
gnupg \
|
||||
iconv \
|
||||
imap \
|
||||
|
||||
@ -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
|
||||
@ -1,16 +1,18 @@
|
||||
#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
|
||||
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/ bullseye-security main contrib non-free
|
||||
deb-src http://ftp.ru.debian.org/debian-security/ bullseye-security main contrib non-free
|
||||
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
|
||||
|
||||
@ -44,8 +44,9 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
|
||||
htop \
|
||||
iftop \
|
||||
iputils-ping \
|
||||
libsvn-java \
|
||||
jq \
|
||||
kmod \
|
||||
libsvn-java \
|
||||
libzip4 \
|
||||
locales \
|
||||
lsb-release \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM epicmorg/devel:jdk8
|
||||
FROM epicmorg/devel:jdk11
|
||||
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
@ -61,7 +61,7 @@ RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
|
||||
apt-get update && \
|
||||
apt-get install -y --no-install-recommends --allow-unauthenticated \
|
||||
libc6 \
|
||||
libgcc1 \
|
||||
# libgcc1 \
|
||||
libgssapi-krb5-2 \
|
||||
libicu63 \
|
||||
liblttng-ust0 \
|
||||
@ -107,7 +107,9 @@ RUN chmod +x /services/run-docker.sh && \
|
||||
##################################################################
|
||||
|
||||
#Install packages
|
||||
RUN curl -SL https://github.com/docker/compose/releases/download/1.25.4/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \
|
||||
RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \
|
||||
echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \
|
||||
curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \
|
||||
chmod +x /usr/local/bin/docker-compose
|
||||
|
||||
##################################################################
|
||||
@ -172,7 +174,7 @@ RUN apt-get update && \
|
||||
php7.3-dev \
|
||||
php7.3 \
|
||||
php7.3-mail \
|
||||
php-mailparse \
|
||||
# php-mailparse \
|
||||
php7.3-soap \
|
||||
php7.3-mysql \
|
||||
php7.3-memcached \
|
||||
@ -259,11 +261,17 @@ RUN cd /tmp && \
|
||||
php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
|
||||
rm /tmp/composer-setup.php
|
||||
|
||||
|
||||
|
||||
|
||||
##################################################################
|
||||
# Node.js 12.x
|
||||
##################################################################
|
||||
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
|
||||
apt-get install -y nodejs
|
||||
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 && \
|
||||
apt-get update && \
|
||||
apt-get install -y nodejs yarn
|
||||
|
||||
##################################################################
|
||||
# steam runtime and ssdk
|
||||
@ -278,6 +286,18 @@ RUN cd / && \
|
||||
cd steam-runtime && \
|
||||
printf '%s\n' 3 1 Y Y Y | ./setup.sh
|
||||
|
||||
##################################################################
|
||||
# Android SDK
|
||||
##################################################################
|
||||
RUN apt-get install -y --allow-unauthenticated \
|
||||
android-sdk \
|
||||
android-sdk-build-tools \
|
||||
android-sdk-platform-tools && \
|
||||
echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licensesandroid-sdk-license
|
||||
|
||||
ENV ANDROID_HOME=/usr/lib/android-sdk
|
||||
ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk
|
||||
|
||||
##################################################################
|
||||
# cleaninig up
|
||||
##################################################################
|
||||
|
||||
@ -33,7 +33,7 @@ RUN apt-get update && \
|
||||
php-snmp \
|
||||
php-ldap \
|
||||
php-mail \
|
||||
php-mailparse \
|
||||
# php-mailparse \
|
||||
php-soap \
|
||||
php-mysql \
|
||||
php-memcached \
|
||||
@ -51,7 +51,7 @@ RUN apt-get update && \
|
||||
php-xmlrpc \
|
||||
php-xml \
|
||||
php-mbstring \
|
||||
php-gettext \
|
||||
# php-gettext \
|
||||
php-apcu \
|
||||
php-common \
|
||||
php-json \
|
||||
@ -77,7 +77,7 @@ RUN apt-get update && \
|
||||
fileinfo \
|
||||
gd \
|
||||
geoip \
|
||||
gettext \
|
||||
# gettext \
|
||||
gnupg \
|
||||
iconv \
|
||||
imap \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user