Fixed etherpad mysql client library to mariadb and added version as parameters
parent
b85f941bfe
commit
566f36eee6
|
@ -1,17 +1,20 @@
|
||||||
|
ARG IMG
|
||||||
|
FROM ${IMG}
|
||||||
|
|
||||||
FROM node:lts
|
FROM node:lts
|
||||||
MAINTAINER James Swineson <jamesswineson@gmail.com>
|
MAINTAINER James Swineson <jamesswineson@gmail.com>
|
||||||
|
|
||||||
ENV ETHERPAD_VERSION 1.8.13
|
|
||||||
|
|
||||||
ENV NODE_ENV production
|
ENV NODE_ENV production
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get upgrade -y && \
|
apt-get upgrade -y && \
|
||||||
apt-get install -y curl unzip mysql-client supervisor gzip git python libssl-dev pkg-config build-essential && \
|
apt-get install -y curl unzip mariadb-client supervisor gzip git python libssl-dev pkg-config build-essential && \
|
||||||
rm -r /var/lib/apt/lists/*
|
rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
WORKDIR /opt/
|
WORKDIR /opt/
|
||||||
|
|
||||||
|
ARG ETHERPAD_VERSION
|
||||||
|
|
||||||
RUN curl -SL \
|
RUN curl -SL \
|
||||||
https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.zip \
|
https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.zip \
|
||||||
> etherpad.zip && unzip etherpad && rm etherpad.zip && \
|
> etherpad.zip && unzip etherpad && rm etherpad.zip && \
|
||||||
|
|
|
@ -5,6 +5,9 @@ services:
|
||||||
build:
|
build:
|
||||||
context: ${BUILD_ROOT_PATH}/docker/etherpad
|
context: ${BUILD_ROOT_PATH}/docker/etherpad
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
|
args:
|
||||||
|
- IMG=${ETHERPAD_IMG}
|
||||||
|
- ETHERPAD_VERSION=${ETHERPAD_VERSION}
|
||||||
container_name: isard-apps-etherpad
|
container_name: isard-apps-etherpad
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG IMG=$NEXTCLOUD_IMG
|
ARG IMG
|
||||||
FROM ${IMG}
|
FROM ${IMG}
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 41af906e60bbd7c0923229d5e47194c3a8fce69e
|
Subproject commit 16c54c0fcea8318db7cc28fd044fcc20294fa729
|
Loading…
Reference in New Issue