Merge remote-tracking branch 'origin/develop' into master

This commit is contained in:
STAM 2020-10-03 21:03:04 +03:00
commit 07ebdf7060
5 changed files with 62 additions and 2 deletions

View File

@ -269,6 +269,14 @@ matrix:
- docker build --compress -t epicmorg/postgres:latest postgres/latest
- docker push epicmorg/postgres:latest
##########
- name: vk2discord (latest)
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/vk2discord:latest vk2discord/latest
- docker push epicmorg/vk2discord:latest
##########
- name: qBitTorrent (latest)

View File

@ -1,6 +1,6 @@
all: bitbucket
all: tr
bitbucket:
tr:
docker build --compress -t epicmorg/testrail .
docker push epicmorg/testrail

View File

@ -0,0 +1,44 @@
FROM epicmorg/devel AS builder
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive
WORKDIR /tmp
RUN git clone https://github.com/MrZillaGold/VK2Discord.git vk2discord
FROM epicmorg/edge
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive
##################################################################
# Node.js 14.x
##################################################################
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://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \
apt-get update && \
apt-get install -y nodejs yarn
##################################################################
# Installing vk2discord
##################################################################
WORKDIR /usr/src/vk2discord
COPY --from=builder /tmp/vk2discord/package*.json /usr/src/vk2discord/
RUN [ "npm", "install" ]
COPY --from=builder /tmp/vk2discord/* /usr/src/vk2discord/
##################################################################
# cleaninig up
##################################################################
RUN apt clean -y && \
apt-get clean all && \
apt autoclean -y && \
rm -rfv /var/lib/apt/lists/* && \
rm -rfv /var/cache/apt/archives/*.deb
CMD [ "npm", "start" ]

View File

@ -0,0 +1,5 @@
all: vk2d
vk2d:
docker build --compress -t epicmorg/vk2discord:latest .
docker push epicmorg/vk2discord

View File

@ -0,0 +1,3 @@
## VK2Discord
* Based on our ecosystem, original [here](https://github.com/MrZillaGold/VK2Discord).