Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OERu
wenotes-docker
Commits
027e3564
Commit
027e3564
authored
Dec 21, 2016
by
Dave Lane
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Trusty configuration to Xenial to buy 2 years of image support
parent
7fcf95fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
docker-couchdb-2.x/Dockerfile
docker-couchdb-2.x/Dockerfile
+4
-4
No files found.
docker-couchdb-2.x/Dockerfile
View file @
027e3564
...
...
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations under
# the License.
FROM
ubuntu:
trusty
FROM
ubuntu:
xenial
MAINTAINER
Dave Lane dave@oerfoundation.org
# (adapted from work by Clemens Stolle klaemo@apache.org)
...
...
@@ -23,7 +23,7 @@ MAINTAINER Dave Lane dave@oerfoundation.org
# updating details for session validation, and possibly integrating Mautic...
ENV
APT_SERVER http://ucmirror.canterbury.ac.nz/ubuntu
ENV
APT_FILE sources.list
ENV
UBUNTU_NAME
trusty
ENV
UBUNTU_NAME
xenial
# subdue the "Dialog" errors...
ENV
DEBIAN_FRONTEND noninteractive
ENV
COUCHDIR /opt/couchdb
...
...
@@ -49,7 +49,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
haproxy
\
erlang-nox
\
erlang-reltool
\
libicu52
\
#
libicu52
\
libmozjs185-1.0
\
openssl
\
&&
rm
-rf
/var/lib/apt/lists/
*
...
...
@@ -107,7 +107,7 @@ RUN apt-get install -y --no-install-recommends \
make \
perl \
&& apt-get autoremove -y && apt-get clean \
&& apt-get install -y libicu52 --no-install-recommends \
#
&& apt-get install -y libicu52 --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb*
# Sprinkle couchdb configuration to the right places...
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment