Skip to content
Snippets Groups Projects
Commit 7c92dff5 authored by Carlos Brandt's avatar Carlos Brandt
Browse files

Removed the dachs.sh entrypoint.

Also, changed from debian to ubuntu 'cause problems with mirrors/version.
parent 42aa7236
No related branches found
No related tags found
No related merge requests found
FROM debian:jessie
FROM ubuntu:trusty
LABEL Description=DaCHS\ is\ a\ publishing\ infrastructure\ for\ the\ Virtual\ Observatory. \
Author=Markus\ Demleitner \
......@@ -16,25 +16,25 @@ RUN apt-get update && \
# This is the brute-force solution for Debian;
# I am having problems in set locales non-interactively,
# and since I really need the "C/UTF8" for postgres, will just set it for all.
ENV LC_ALL C.UTF-8
RUN echo LC_ALL="$LC_ALL" > /etc/default/locale
#ENV LC_ALL C.UTF-8
#RUN echo LC_ALL="$LC_ALL" > /etc/default/locale
# I'll leave the lines below for further look;
# These work just find under Ubuntu.
# (Yeah, I'll remove these lines in the near future...probably...)
#ENV LANG en_US.UTF-8
#ENV LANGUAGE en_US:en
#ENV LC_CTYPE C.UTF-8
#RUN locale-gen --purge $LANG && \
# echo LANG="$LANG" > /etc/default/locale && \
# echo LANGUAGE="$LANGUAGE" >> /etc/default/locale && \
# echo LC_CTYPE="$LC_CTYPE" >> /etc/default/locale
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_CTYPE C.UTF-8
RUN locale-gen --purge $LANG && \
echo LANG="$LANG" > /etc/default/locale && \
echo LANGUAGE="$LANGUAGE" >> /etc/default/locale && \
echo LC_CTYPE="$LC_CTYPE" >> /etc/default/locale
RUN echo 'deb http://vo.ari.uni-heidelberg.de/debian stable main' > /etc/apt/sources.list.d/gavo.list && \
echo 'deb-src http://vo.ari.uni-heidelberg.de/debian stable main' >> /etc/apt/sources.list.d/gavo.list && \
wget -qO - http://docs.g-vo.org/archive-key.asc | apt-key add -
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > /etc/apt/sources.list.d/pgdg.list && \
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' > /etc/apt/sources.list.d/pgdg.list && \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
RUN sed -i 's/exit 101/exit 0/' /usr/sbin/policy-rc.d
......@@ -48,4 +48,5 @@ COPY etc/gavo.rc /etc/gavo.rc
COPY bin/dachs.sh /dachs.sh
EXPOSE 8080
ENTRYPOINT ["/dachs.sh"]
#ENTRYPOINT ["/dachs.sh"]
ENTRYPOINT ["/bin/bash"]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment