mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2025-01-26 05:27:57 +03:00
Merge branch 'develop' into master
This commit is contained in:
commit
a57d6c752d
@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
|
|||||||
##################################################################
|
##################################################################
|
||||||
# ARGuments
|
# ARGuments
|
||||||
##################################################################
|
##################################################################
|
||||||
ARG JIRA_VERSION=8.12.2
|
ARG JIRA_VERSION=8.12.3
|
||||||
ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
|
ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
|
||||||
|
|
||||||
##################################################################
|
##################################################################
|
||||||
|
@ -11,7 +11,7 @@ ARG SRC_DIR=${BUILDS_DIR}/src
|
|||||||
ARG EXPORT_DIR=${BUILDS_DIR}/export
|
ARG EXPORT_DIR=${BUILDS_DIR}/export
|
||||||
ARG PRE_DIR=${BUILDS_DIR}/pre
|
ARG PRE_DIR=${BUILDS_DIR}/pre
|
||||||
ARG NGINX_SRC_DIR=${SRC_DIR}/nginx
|
ARG NGINX_SRC_DIR=${SRC_DIR}/nginx
|
||||||
ARG NGINX_VERSION=1.19.3
|
ARG NGINX_VERSION=1.19.4
|
||||||
ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
|
ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
|
||||||
ARG LUAJIT_INC=/usr/local/include/luajit-2.1
|
ARG LUAJIT_INC=/usr/local/include/luajit-2.1
|
||||||
ARG LUAJIT_LIB=/usr/local/lib
|
ARG LUAJIT_LIB=/usr/local/lib
|
||||||
@ -199,9 +199,15 @@ RUN apt-get update && \
|
|||||||
ln -s /usr/local/lib/libIP2Location.so /usr/lib/libIP2Location.so && \
|
ln -s /usr/local/lib/libIP2Location.so /usr/lib/libIP2Location.so && \
|
||||||
ln -s /usr/local/lib/libIP2Location.so.1 /usr/lib/libIP2Location.so.1 && \
|
ln -s /usr/local/lib/libIP2Location.so.1 /usr/lib/libIP2Location.so.1 && \
|
||||||
ln -s /usr/local/lib/libIP2Location.so.2 /usr/lib/libIP2Location.so.2 && \
|
ln -s /usr/local/lib/libIP2Location.so.2 /usr/lib/libIP2Location.so.2 && \
|
||||||
|
ln -s /usr/local/lib/libIP2Location.so.3 /usr/lib/libIP2Location.so.3 && \
|
||||||
|
ln -s /usr/local/lib/libIP2Location.so.4 /usr/lib/libIP2Location.so.4 && \
|
||||||
|
ln -s /usr/local/lib/libIP2Location.so.5 /usr/lib/libIP2Location.so.5 && \
|
||||||
ln -s /usr/local/lib/libIP2Location.so /lib/libIP2Location.so && \
|
ln -s /usr/local/lib/libIP2Location.so /lib/libIP2Location.so && \
|
||||||
ln -s /usr/local/lib/libIP2Location.so.1 /lib/libIP2Location.so.1 && \
|
ln -s /usr/local/lib/libIP2Location.so.1 /lib/libIP2Location.so.1 && \
|
||||||
ln -s /usr/local/lib/libIP2Location.so.2 /lib/libIP2Location.so.2 && \
|
ln -s /usr/local/lib/libIP2Location.so.2 /lib/libIP2Location.so.2 && \
|
||||||
|
ln -s /usr/local/lib/libIP2Location.so.3 /lib/libIP2Location.so.3 && \
|
||||||
|
ln -s /usr/local/lib/libIP2Location.so.4 /lib/libIP2Location.so.4 && \
|
||||||
|
ln -s /usr/local/lib/libIP2Location.so.5 /lib/libIP2Location.so.5 && \
|
||||||
ln -sf /dev/stdout /var/log/nginx/access.log && \
|
ln -sf /dev/stdout /var/log/nginx/access.log && \
|
||||||
ln -sf /dev/stderr /var/log/nginx/error.log && \
|
ln -sf /dev/stderr /var/log/nginx/error.log && \
|
||||||
ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \
|
ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \
|
||||||
|
@ -28,7 +28,7 @@ WORKDIR /usr/src/vk2discord
|
|||||||
|
|
||||||
COPY --from=builder /tmp/vk2discord/package*.json /usr/src/vk2discord/
|
COPY --from=builder /tmp/vk2discord/package*.json /usr/src/vk2discord/
|
||||||
|
|
||||||
RUN [ "npm", "install" ]
|
RUN npm install -g
|
||||||
|
|
||||||
COPY --from=builder /tmp/vk2discord/* /usr/src/vk2discord/
|
COPY --from=builder /tmp/vk2discord/* /usr/src/vk2discord/
|
||||||
|
|
||||||
@ -41,4 +41,4 @@ RUN apt clean -y && \
|
|||||||
rm -rfv /var/lib/apt/lists/* && \
|
rm -rfv /var/lib/apt/lists/* && \
|
||||||
rm -rfv /var/cache/apt/archives/*.deb
|
rm -rfv /var/cache/apt/archives/*.deb
|
||||||
|
|
||||||
CMD [ "npm", "start" ]
|
CMD npm start
|
||||||
|
Loading…
x
Reference in New Issue
Block a user