-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Add CentOS variant and new template system #2917
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 6d091a7..989fa5b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,16 +1,28 @@
nuxeo:6
+nuxeo:6-centos
nuxeo:6.0
+nuxeo:6.0-centos
nuxeo:7
+nuxeo:7-centos
nuxeo:7.10
+nuxeo:7.10-centos
nuxeo:8
-nuxeo:8.2
-nuxeo:8.3
+nuxeo:8-centos
nuxeo:8.10
+nuxeo:8.10-centos
nuxeo:9
+nuxeo:9-centos
nuxeo:9.1
+nuxeo:9.1-centos
nuxeo:FT
+nuxeo:FT-centos
nuxeo:LTS
nuxeo:LTS-2014
+nuxeo:LTS-2014-centos
nuxeo:LTS-2015
+nuxeo:LTS-2015-centos
nuxeo:LTS-2016
-nuxeo:latest
+nuxeo:LTS-2016-centos
+nuxeo:LTS-centos
+nuxeo:centos
+nuxeo:ubuntu
diff --git a/nuxeo_6.0/docker-entrypoint.sh b/nuxeo_6.0/docker-entrypoint.sh
deleted file mode 100755
index be5945e..0000000
diff --git a/nuxeo_8.2/Dockerfile b/nuxeo_8.2/Dockerfile
deleted file mode 100644
index 615281b..0000000
diff --git a/nuxeo_8.2/docker-entrypoint.sh b/nuxeo_8.2/docker-entrypoint.sh
deleted file mode 100755
index e7ccfce..0000000
diff --git a/nuxeo_8.2/imagemagick-policy.xml b/nuxeo_8.2/imagemagick-policy.xml
deleted file mode 100644
index d88e8bf..0000000
diff --git a/nuxeo_8.3/Dockerfile b/nuxeo_8.3/Dockerfile
deleted file mode 100644
index a3365f9..0000000
diff --git a/nuxeo_8.3/docker-entrypoint.sh b/nuxeo_8.3/docker-entrypoint.sh
deleted file mode 100755
index 33548fd..0000000
diff --git a/nuxeo_6.0/Dockerfile b/nuxeo_LTS-2014-centos/Dockerfile
similarity index 74%
copy from nuxeo_6.0/Dockerfile
copy to nuxeo_LTS-2014-centos/Dockerfile
index 33fd056..7fb38ec 100644
--- a/nuxeo_6.0/Dockerfile
+++ b/nuxeo_LTS-2014-centos/Dockerfile
@@ -1,33 +1,47 @@
# vim:set ft=dockerfile:
-FROM openjdk:8-jdk
+FROM centos:7
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
+# install java
+RUN yum install -y \
+ java-1.8.0-openjdk
+
+# install wget
+RUN yum -y install wget
+
+#Add repositories need it for ffmpeg2theora and ffmpeg
+ARG NUX_GPG_KEY_URL=http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro
+ARG NUX_DEXTOP_RPM_URL=http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-1.el7.nux.noarch.rpm
+RUN yum -y install epel-release \
+ && rpm --import ${NUX_GPG_KEY_URL} \
+ && rpm -Uvh ${NUX_DEXTOP_RPM_URL}
# Add needed convert tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN yum -y upgrade && yum -y install \
perl \
- locales \
- pwgen \
- imagemagick \
+ ImageMagick \
+ ffmpeg \
ffmpeg2theora \
ufraw \
poppler-utils \
libreoffice \
libwpd-tools \
- exiftool \
- ghostscript \
- && rm -rf /var/lib/apt/lists/*
-
+ perl-Image-ExifTool \
+ ghostscript
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=6.0
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-cap-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-6.0/nuxeo-cap-6.0-tomcat.zip
ARG NUXEO_MD5=b8cbc0b2858b0697a541be49feb24571
+# https://jira.nuxeo.com/browse/NXP-20189
+ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
@@ -56,9 +70,6 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
WORKDIR $NUXEO_HOME
diff --git a/nuxeo_7.10/docker-entrypoint.sh b/nuxeo_LTS-2014-centos/docker-entrypoint.sh
similarity index 100%
copy from nuxeo_7.10/docker-entrypoint.sh
copy to nuxeo_LTS-2014-centos/docker-entrypoint.sh
diff --git a/nuxeo_6.0/Dockerfile b/nuxeo_LTS-2014/Dockerfile
similarity index 93%
rename from nuxeo_6.0/Dockerfile
rename to nuxeo_LTS-2014/Dockerfile
index 33fd056..e8b148f 100644
--- a/nuxeo_6.0/Dockerfile
+++ b/nuxeo_LTS-2014/Dockerfile
@@ -2,10 +2,6 @@
FROM openjdk:8-jdk
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
-
# Add needed convert tools
RUN apt-get update && apt-get install -y --no-install-recommends \
perl \
@@ -21,13 +17,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ghostscript \
&& rm -rf /var/lib/apt/lists/*
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=6.0
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-cap-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-6.0/nuxeo-cap-6.0-tomcat.zip
ARG NUXEO_MD5=b8cbc0b2858b0697a541be49feb24571
+# https://jira.nuxeo.com/browse/NXP-20189
+ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
@@ -56,9 +58,6 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
WORKDIR $NUXEO_HOME
diff --git a/nuxeo_8.10/docker-entrypoint.sh b/nuxeo_LTS-2014/docker-entrypoint.sh
similarity index 100%
rename from nuxeo_8.10/docker-entrypoint.sh
rename to nuxeo_LTS-2014/docker-entrypoint.sh
diff --git a/nuxeo_7.10/Dockerfile b/nuxeo_LTS-2015-centos/Dockerfile
similarity index 75%
copy from nuxeo_7.10/Dockerfile
copy to nuxeo_LTS-2015-centos/Dockerfile
index b598b6c..60d19a6 100644
--- a/nuxeo_7.10/Dockerfile
+++ b/nuxeo_LTS-2015-centos/Dockerfile
@@ -1,33 +1,47 @@
# vim:set ft=dockerfile:
-FROM openjdk:8-jdk
+FROM centos:7
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
+# install java
+RUN yum install -y \
+ java-1.8.0-openjdk
+
+# install wget
+RUN yum -y install wget
+
+#Add repositories need it for ffmpeg2theora and ffmpeg
+ARG NUX_GPG_KEY_URL=http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro
+ARG NUX_DEXTOP_RPM_URL=http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-1.el7.nux.noarch.rpm
+RUN yum -y install epel-release \
+ && rpm --import ${NUX_GPG_KEY_URL} \
+ && rpm -Uvh ${NUX_DEXTOP_RPM_URL}
# Add needed convert tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN yum -y upgrade && yum -y install \
perl \
- locales \
- pwgen \
- imagemagick \
+ ImageMagick \
+ ffmpeg \
ffmpeg2theora \
ufraw \
poppler-utils \
libreoffice \
libwpd-tools \
- exiftool \
- ghostscript \
- && rm -rf /var/lib/apt/lists/*
-
+ perl-Image-ExifTool \
+ ghostscript
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=7.10
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-cap-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-7.10/nuxeo-cap-7.10-tomcat.zip
ARG NUXEO_MD5=de2084b1a6fab4b1c8fb769903b044f2
+# https://jira.nuxeo.com/browse/NXP-20189
+ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
@@ -56,11 +70,8 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
-ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
WORKDIR $NUXEO_HOME
COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/nuxeo_7.10/docker-entrypoint.sh b/nuxeo_LTS-2015-centos/docker-entrypoint.sh
similarity index 100%
copy from nuxeo_7.10/docker-entrypoint.sh
copy to nuxeo_LTS-2015-centos/docker-entrypoint.sh
diff --git a/nuxeo_7.10/Dockerfile b/nuxeo_LTS-2015/Dockerfile
similarity index 94%
rename from nuxeo_7.10/Dockerfile
rename to nuxeo_LTS-2015/Dockerfile
index b598b6c..f5d4374 100644
--- a/nuxeo_7.10/Dockerfile
+++ b/nuxeo_LTS-2015/Dockerfile
@@ -2,10 +2,6 @@
FROM openjdk:8-jdk
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
-
# Add needed convert tools
RUN apt-get update && apt-get install -y --no-install-recommends \
perl \
@@ -21,13 +17,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ghostscript \
&& rm -rf /var/lib/apt/lists/*
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=7.10
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-cap-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-7.10/nuxeo-cap-7.10-tomcat.zip
ARG NUXEO_MD5=de2084b1a6fab4b1c8fb769903b044f2
+# https://jira.nuxeo.com/browse/NXP-20189
+ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
@@ -56,11 +58,8 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
-ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
WORKDIR $NUXEO_HOME
COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/nuxeo_7.10/docker-entrypoint.sh b/nuxeo_LTS-2015/docker-entrypoint.sh
similarity index 100%
copy from nuxeo_7.10/docker-entrypoint.sh
copy to nuxeo_LTS-2015/docker-entrypoint.sh
diff --git a/nuxeo_8.10/Dockerfile b/nuxeo_LTS-centos/Dockerfile
similarity index 76%
copy from nuxeo_8.10/Dockerfile
copy to nuxeo_LTS-centos/Dockerfile
index 4a31351..f6d5b67 100644
--- a/nuxeo_8.10/Dockerfile
+++ b/nuxeo_LTS-centos/Dockerfile
@@ -1,34 +1,47 @@
# vim:set ft=dockerfile:
-FROM openjdk:8-jdk
+FROM centos:7
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
+# install java
+RUN yum install -y \
+ java-1.8.0-openjdk
+
+# install wget
+RUN yum -y install wget
+
+#Add repositories need it for ffmpeg2theora and ffmpeg
+ARG NUX_GPG_KEY_URL=http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro
+ARG NUX_DEXTOP_RPM_URL=http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-1.el7.nux.noarch.rpm
+RUN yum -y install epel-release \
+ && rpm --import ${NUX_GPG_KEY_URL} \
+ && rpm -Uvh ${NUX_DEXTOP_RPM_URL}
# Add needed convert tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN yum -y upgrade && yum -y install \
perl \
- locales \
- pwgen \
- imagemagick \
+ ImageMagick \
+ ffmpeg \
ffmpeg2theora \
ufraw \
poppler-utils \
libreoffice \
libwpd-tools \
- exiftool \
- ghostscript \
- && rm -rf /var/lib/apt/lists/*
-
+ perl-Image-ExifTool \
+ ghostscript
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=8.10
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-server-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-8.10/nuxeo-server-8.10-tomcat.zip
ARG NUXEO_MD5=29e67a19bba54099093b51d892926be1
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
+
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
&& echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c - \
@@ -56,9 +69,6 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
WORKDIR $NUXEO_HOME
diff --git a/nuxeo_7.10/docker-entrypoint.sh b/nuxeo_LTS-centos/docker-entrypoint.sh
similarity index 100%
copy from nuxeo_7.10/docker-entrypoint.sh
copy to nuxeo_LTS-centos/docker-entrypoint.sh
diff --git a/nuxeo_8.10/Dockerfile b/nuxeo_LTS/Dockerfile
similarity index 95%
rename from nuxeo_8.10/Dockerfile
rename to nuxeo_LTS/Dockerfile
index 4a31351..6ce1757 100644
--- a/nuxeo_8.10/Dockerfile
+++ b/nuxeo_LTS/Dockerfile
@@ -2,10 +2,6 @@
FROM openjdk:8-jdk
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
-
# Add needed convert tools
RUN apt-get update && apt-get install -y --no-install-recommends \
perl \
@@ -21,14 +17,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ghostscript \
&& rm -rf /var/lib/apt/lists/*
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=8.10
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-server-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-8.10/nuxeo-server-8.10-tomcat.zip
ARG NUXEO_MD5=29e67a19bba54099093b51d892926be1
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
+
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
&& echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c - \
@@ -56,9 +57,6 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
WORKDIR $NUXEO_HOME
diff --git a/nuxeo_7.10/docker-entrypoint.sh b/nuxeo_LTS/docker-entrypoint.sh
similarity index 100%
rename from nuxeo_7.10/docker-entrypoint.sh
rename to nuxeo_LTS/docker-entrypoint.sh
diff --git a/nuxeo_FT/Dockerfile b/nuxeo_centos/Dockerfile
similarity index 77%
copy from nuxeo_FT/Dockerfile
copy to nuxeo_centos/Dockerfile
index 2be82dc..b16ee95 100644
--- a/nuxeo_FT/Dockerfile
+++ b/nuxeo_centos/Dockerfile
@@ -1,21 +1,33 @@
# vim:set ft=dockerfile:
-FROM openjdk:8-jdk
+FROM centos:7
MAINTAINER Nuxeo <[email protected]>
+# install java
+RUN yum install -y \
+ java-1.8.0-openjdk
+
+# install wget
+RUN yum -y install wget
+
+#Add repositories need it for ffmpeg2theora and ffmpeg
+ARG NUX_GPG_KEY_URL=http://li.nux.ro/download/nux/RPM-GPG-KEY-nux.ro
+ARG NUX_DEXTOP_RPM_URL=http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-1.el7.nux.noarch.rpm
+RUN yum -y install epel-release \
+ && rpm --import ${NUX_GPG_KEY_URL} \
+ && rpm -Uvh ${NUX_DEXTOP_RPM_URL}
+
# Add needed convert tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN yum -y upgrade && yum -y install \
perl \
- locales \
- pwgen \
- imagemagick \
+ ImageMagick \
+ ffmpeg \
ffmpeg2theora \
ufraw \
poppler-utils \
libreoffice \
libwpd-tools \
- exiftool \
- ghostscript \
- && rm -rf /var/lib/apt/lists/*
+ perl-Image-ExifTool \
+ ghostscript
# Remove setuid/setgid binaries from images for security
@@ -33,7 +45,7 @@ RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
- && echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c - \
+ && if [ $NUXEO_VERSION != "master" ]; then echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c -; fi \
&& mkdir -p /tmp/nuxeo-distribution $(dirname $NUXEO_HOME) \
&& unzip -q -d /tmp/nuxeo-distribution /tmp/nuxeo-distribution-tomcat.zip \
&& DISTDIR=$(/bin/ls /tmp/nuxeo-distribution | head -n 1) \
diff --git a/nuxeo_FT/docker-entrypoint.sh b/nuxeo_centos/docker-entrypoint.sh
similarity index 100%
copy from nuxeo_FT/docker-entrypoint.sh
copy to nuxeo_centos/docker-entrypoint.sh
diff --git a/nuxeo_FT/docker-template/config/transient-store-config.xml.nxftl b/nuxeo_centos/docker-template/config/transient-store-config.xml.nxftl
similarity index 100%
copy from nuxeo_FT/docker-template/config/transient-store-config.xml.nxftl
copy to nuxeo_centos/docker-template/config/transient-store-config.xml.nxftl
diff --git a/nuxeo_FT/docker-template/nuxeo.defaults b/nuxeo_centos/docker-template/nuxeo.defaults
similarity index 100%
copy from nuxeo_FT/docker-template/nuxeo.defaults
copy to nuxeo_centos/docker-template/nuxeo.defaults
diff --git a/nuxeo_FT/nuxeo.conf b/nuxeo_centos/nuxeo.conf
similarity index 100%
copy from nuxeo_FT/nuxeo.conf
copy to nuxeo_centos/nuxeo.conf
diff --git a/nuxeo_FT/Dockerfile b/nuxeo_ubuntu/Dockerfile
similarity index 95%
rename from nuxeo_FT/Dockerfile
rename to nuxeo_ubuntu/Dockerfile
index 2be82dc..2b41a08 100644
--- a/nuxeo_FT/Dockerfile
+++ b/nuxeo_ubuntu/Dockerfile
@@ -33,7 +33,7 @@ RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
- && echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c - \
+ && if [ $NUXEO_VERSION != "master" ]; then echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c -; fi \
&& mkdir -p /tmp/nuxeo-distribution $(dirname $NUXEO_HOME) \
&& unzip -q -d /tmp/nuxeo-distribution /tmp/nuxeo-distribution-tomcat.zip \
&& DISTDIR=$(/bin/ls /tmp/nuxeo-distribution | head -n 1) \
diff --git a/nuxeo_FT/docker-entrypoint.sh b/nuxeo_ubuntu/docker-entrypoint.sh
similarity index 100%
rename from nuxeo_FT/docker-entrypoint.sh
rename to nuxeo_ubuntu/docker-entrypoint.sh
diff --git a/nuxeo_FT/docker-template/config/transient-store-config.xml.nxftl b/nuxeo_ubuntu/docker-template/config/transient-store-config.xml.nxftl
similarity index 100%
rename from nuxeo_FT/docker-template/config/transient-store-config.xml.nxftl
rename to nuxeo_ubuntu/docker-template/config/transient-store-config.xml.nxftl
diff --git a/nuxeo_FT/docker-template/nuxeo.defaults b/nuxeo_ubuntu/docker-template/nuxeo.defaults
similarity index 100%
rename from nuxeo_FT/docker-template/nuxeo.defaults
rename to nuxeo_ubuntu/docker-template/nuxeo.defaults
diff --git a/nuxeo_FT/nuxeo.conf b/nuxeo_ubuntu/nuxeo.conf
similarity index 100%
rename from nuxeo_FT/nuxeo.conf
rename to nuxeo_ubuntu/nuxeo.conf |
@yosifkit ⬆️ ? |
Sorry, thought I had done something with this pr. 😞 Below is my usual response when adding a different distribution based image. The reasoning is that we don't want to open the doors for "request image Y based on Linux distro X". So, my question is, what does the CentOS variant add that is not served by the current image? I didn't see any discussion on nuxeo/docker-nuxeo#10 but I have no idea what "NXP 21995" is. For most official repos (at least the ones we maintain directly) we don't add extra releases based on other Linux distributions. For most users, just having "percona" at a specific version fulfills all their requirements. They don't need to care about the underlying distribution it is running within. If they are running their own application, in python for example, and they are unable to run it in our Debian, Alpine, or Windows Server Core based python images, then they are free to install python and their required dependencies within CentOS, Ubuntu, or other base distribution image. For many images here are the variants that we maintain with short descriptions and why we have them:
|
No pb, I told you no rush ! Some of our customer want to have a RHEL base distribution which we can't put in official repo of course. This is legitimate for them since they may have security fixes from the upstream RHEL image. CentOS is the closest distribution we can find to RHEL so we wanted to have an official build based on it. |
Thanks for understanding. We are willing to add more distribution specific variants (like the discussion in docker-library/mysql#289), though it seems what your customers really want is RHEL and not just CentOS. I would think that RedHat has a way to allow you to build those sorts of images for your customers that are also their customers. (working on a build test now so that we can get the rest merged) Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index 6d091a7..f13b9a1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,8 +3,6 @@ nuxeo:6.0
nuxeo:7
nuxeo:7.10
nuxeo:8
-nuxeo:8.2
-nuxeo:8.3
nuxeo:8.10
nuxeo:9
nuxeo:9.1
diff --git a/nuxeo_6.0/docker-entrypoint.sh b/nuxeo_6.0/docker-entrypoint.sh
deleted file mode 100755
index be5945e..0000000
diff --git a/nuxeo_8.2/Dockerfile b/nuxeo_8.2/Dockerfile
deleted file mode 100644
index 615281b..0000000
diff --git a/nuxeo_8.2/docker-entrypoint.sh b/nuxeo_8.2/docker-entrypoint.sh
deleted file mode 100755
index e7ccfce..0000000
diff --git a/nuxeo_8.2/imagemagick-policy.xml b/nuxeo_8.2/imagemagick-policy.xml
deleted file mode 100644
index d88e8bf..0000000
diff --git a/nuxeo_8.3/Dockerfile b/nuxeo_8.3/Dockerfile
deleted file mode 100644
index a3365f9..0000000
diff --git a/nuxeo_8.3/docker-entrypoint.sh b/nuxeo_8.3/docker-entrypoint.sh
deleted file mode 100755
index 33548fd..0000000
diff --git a/nuxeo_6.0/Dockerfile b/nuxeo_LTS-2014/Dockerfile
similarity index 93%
rename from nuxeo_6.0/Dockerfile
rename to nuxeo_LTS-2014/Dockerfile
index 33fd056..e8b148f 100644
--- a/nuxeo_6.0/Dockerfile
+++ b/nuxeo_LTS-2014/Dockerfile
@@ -2,10 +2,6 @@
FROM openjdk:8-jdk
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
-
# Add needed convert tools
RUN apt-get update && apt-get install -y --no-install-recommends \
perl \
@@ -21,13 +17,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ghostscript \
&& rm -rf /var/lib/apt/lists/*
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=6.0
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-cap-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-6.0/nuxeo-cap-6.0-tomcat.zip
ARG NUXEO_MD5=b8cbc0b2858b0697a541be49feb24571
+# https://jira.nuxeo.com/browse/NXP-20189
+ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
@@ -56,9 +58,6 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
WORKDIR $NUXEO_HOME
diff --git a/nuxeo_7.10/docker-entrypoint.sh b/nuxeo_LTS-2014/docker-entrypoint.sh
similarity index 100%
copy from nuxeo_7.10/docker-entrypoint.sh
copy to nuxeo_LTS-2014/docker-entrypoint.sh
diff --git a/nuxeo_7.10/Dockerfile b/nuxeo_LTS-2015/Dockerfile
similarity index 94%
rename from nuxeo_7.10/Dockerfile
rename to nuxeo_LTS-2015/Dockerfile
index b598b6c..f5d4374 100644
--- a/nuxeo_7.10/Dockerfile
+++ b/nuxeo_LTS-2015/Dockerfile
@@ -2,10 +2,6 @@
FROM openjdk:8-jdk
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
-
# Add needed convert tools
RUN apt-get update && apt-get install -y --no-install-recommends \
perl \
@@ -21,13 +17,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ghostscript \
&& rm -rf /var/lib/apt/lists/*
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=7.10
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-cap-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-7.10/nuxeo-cap-7.10-tomcat.zip
ARG NUXEO_MD5=de2084b1a6fab4b1c8fb769903b044f2
+# https://jira.nuxeo.com/browse/NXP-20189
+ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
@@ -56,11 +58,8 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
-ENV LAUNCHER_DEBUG -Djvmcheck=nofail
+
WORKDIR $NUXEO_HOME
COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/nuxeo_8.10/docker-entrypoint.sh b/nuxeo_LTS-2015/docker-entrypoint.sh
similarity index 100%
rename from nuxeo_8.10/docker-entrypoint.sh
rename to nuxeo_LTS-2015/docker-entrypoint.sh
diff --git a/nuxeo_8.10/Dockerfile b/nuxeo_LTS/Dockerfile
similarity index 86%
rename from nuxeo_8.10/Dockerfile
rename to nuxeo_LTS/Dockerfile
index 4a31351..441301b 100644
--- a/nuxeo_8.10/Dockerfile
+++ b/nuxeo_LTS/Dockerfile
@@ -2,12 +2,9 @@
FROM openjdk:8-jdk
MAINTAINER Nuxeo <[email protected]>
-# Create Nuxeo user
-ENV NUXEO_USER nuxeo
-RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
-
# Add needed convert tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN echo "deb http://http.debian.net/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list \
+ && apt-get update && apt-get install -y --no-install-recommends \
perl \
locales \
pwgen \
@@ -15,20 +12,25 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ffmpeg2theora \
ufraw \
poppler-utils \
- libreoffice \
libwpd-tools \
exiftool \
ghostscript \
+ && apt-get install -y --no-install-recommends -t jessie-backports libreoffice \
&& rm -rf /var/lib/apt/lists/*
+# Remove setuid/setgid binaries from images for security
+RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
+ENV NUXEO_USER nuxeo
ENV NUXEO_HOME /opt/nuxeo/server
-
ARG NUXEO_VERSION=8.10
-ARG NUXEO_DIST_URL=http://cdn.nuxeo.com/nuxeo-${NUXEO_VERSION}/nuxeo-server-${NUXEO_VERSION}-tomcat.zip
+ARG NUXEO_DIST_URL=http://community.nuxeo.com/static/releases/nuxeo-8.10/nuxeo-server-8.10-tomcat.zip
ARG NUXEO_MD5=29e67a19bba54099093b51d892926be1
+
+# Create Nuxeo user
+RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
+
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
&& echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c - \
@@ -56,9 +58,6 @@ RUN mkdir -p /var/lib/nuxeo/data \
&& mkdir -p /docker-entrypoint-initnuxeo.d \
&& chown -R 1000:0 /docker-entrypoint-initnuxeo.d && chmod -R g+rwX /docker-entrypoint-initnuxeo.d
-# Remove setuid/setgid binaries from images for security
-RUN find / -perm +6000 -type f -exec chmod a-s {} \; || true
-
ENV PATH $NUXEO_HOME/bin:$PATH
WORKDIR $NUXEO_HOME
@@ -70,3 +69,4 @@ CMD ["nuxeoctl","console"]
USER 1000
+
diff --git a/nuxeo_7.10/docker-entrypoint.sh b/nuxeo_LTS/docker-entrypoint.sh
similarity index 100%
rename from nuxeo_7.10/docker-entrypoint.sh
rename to nuxeo_LTS/docker-entrypoint.sh
diff --git a/nuxeo_FT/Dockerfile b/nuxeo_latest/Dockerfile
similarity index 87%
rename from nuxeo_FT/Dockerfile
rename to nuxeo_latest/Dockerfile
index 2be82dc..5b0c859 100644
--- a/nuxeo_FT/Dockerfile
+++ b/nuxeo_latest/Dockerfile
@@ -3,7 +3,8 @@ FROM openjdk:8-jdk
MAINTAINER Nuxeo <[email protected]>
# Add needed convert tools
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN echo "deb http://http.debian.net/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list \
+ && apt-get update && apt-get install -y --no-install-recommends \
perl \
locales \
pwgen \
@@ -11,10 +12,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ffmpeg2theora \
ufraw \
poppler-utils \
- libreoffice \
libwpd-tools \
exiftool \
ghostscript \
+ && apt-get install -y --no-install-recommends -t jessie-backports libreoffice \
&& rm -rf /var/lib/apt/lists/*
@@ -33,7 +34,7 @@ RUN useradd -m -d /home/$NUXEO_USER -u 1000 -s /bin/bash $NUXEO_USER
# Add distribution
RUN curl -fsSL "${NUXEO_DIST_URL}" -o /tmp/nuxeo-distribution-tomcat.zip \
- && echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c - \
+ && if [ $NUXEO_VERSION != "master" ]; then echo "$NUXEO_MD5 /tmp/nuxeo-distribution-tomcat.zip" | md5sum -c -; fi \
&& mkdir -p /tmp/nuxeo-distribution $(dirname $NUXEO_HOME) \
&& unzip -q -d /tmp/nuxeo-distribution /tmp/nuxeo-distribution-tomcat.zip \
&& DISTDIR=$(/bin/ls /tmp/nuxeo-distribution | head -n 1) \
@@ -71,4 +72,4 @@ EXPOSE 8080
EXPOSE 8787
CMD ["nuxeoctl","console"]
-USER 1000
\ No newline at end of file
+USER 1000
diff --git a/nuxeo_FT/docker-entrypoint.sh b/nuxeo_latest/docker-entrypoint.sh
similarity index 100%
rename from nuxeo_FT/docker-entrypoint.sh
rename to nuxeo_latest/docker-entrypoint.sh
diff --git a/nuxeo_FT/docker-template/config/transient-store-config.xml.nxftl b/nuxeo_latest/docker-template/config/transient-store-config.xml.nxftl
similarity index 100%
rename from nuxeo_FT/docker-template/config/transient-store-config.xml.nxftl
rename to nuxeo_latest/docker-template/config/transient-store-config.xml.nxftl
diff --git a/nuxeo_FT/docker-template/nuxeo.defaults b/nuxeo_latest/docker-template/nuxeo.defaults
similarity index 100%
rename from nuxeo_FT/docker-template/nuxeo.defaults
rename to nuxeo_latest/docker-template/nuxeo.defaults
diff --git a/nuxeo_FT/nuxeo.conf b/nuxeo_latest/nuxeo.conf
similarity index 100%
rename from nuxeo_FT/nuxeo.conf
rename to nuxeo_latest/nuxeo.conf |
Yes, we are a RedHat partner and have access to their repo. But we have to build it on our own internal CI: not a big job... but a job 😄 |
Build test of #2917; 4e624b8 ( $ bashbrew build nuxeo:6.0
Using bashbrew/cache:ae997c1e03c6df3de560608ae511e15908e001bb126e0ec777099ea93924c2ec (nuxeo:6.0)
Tagging nuxeo:6.0
Tagging nuxeo:6
Tagging nuxeo:LTS-2014
$ test/run.sh nuxeo:6.0
testing nuxeo:6.0
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'nuxeo-conf' [5/6]...passed
'nuxeo-basics' [6/6]....passed
$ bashbrew build nuxeo:7.10
Using bashbrew/cache:dc572aa2f957de76d16ee7cff10ba883c203645c23e93d5e4a30189ea32faf6f (nuxeo:7.10)
Tagging nuxeo:7.10
Tagging nuxeo:7
Tagging nuxeo:LTS-2015
$ test/run.sh nuxeo:7.10
testing nuxeo:7.10
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'nuxeo-conf' [5/6]...passed
'nuxeo-basics' [6/6]....passed
$ bashbrew build nuxeo:8.10
Using bashbrew/cache:e5d2aebd1a7caa118046f4f20e3bbaf91adeb570654defc5d6392ad026a354c1 (nuxeo:8.10)
Tagging nuxeo:8.10
Tagging nuxeo:8
Tagging nuxeo:LTS-2016
Tagging nuxeo:LTS
$ test/run.sh nuxeo:8.10
testing nuxeo:8.10
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'nuxeo-conf' [5/6]...passed
'nuxeo-basics' [6/6]....passed
$ bashbrew build nuxeo:9.1
Building bashbrew/cache:4b6942dfb7d1b7445bd7ae057207941b39dbbaeb9cc172e8be074756ede52d5b (nuxeo:9.1)
Tagging nuxeo:9.1
Tagging nuxeo:9
Tagging nuxeo:FT
Tagging nuxeo:latest
$ test/run.sh nuxeo:9.1
testing nuxeo:9.1
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'nuxeo-conf' [5/6]...passed
'nuxeo-basics' [6/6]....passed
Note: build server is sad today so we're waiting a little bit before merging more things to build. |
This just adds a CentOS variant. For that we also introduce a new templating system that allows us to generate more easily the Dockerfiles etc... plus a
generate-stackbrew
script.Complete story of development can be found here : nuxeo/docker-nuxeo#10
No rush to merge, I did that in parallel of our 9.1 release, so PR happens after it.